[csw-devel] SF.net SVN: gar:[13417] csw/mgar/pkg/wmf/trunk/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 13417
          http://gar.svn.sourceforge.net/gar/?rev=13417&view=rev
Author:   dmichelsen
Date:     2011-02-20 15:38:40 +0000 (Sun, 20 Feb 2011)

Log Message:
-----------
wmf: Fix fontpath

Modified Paths:
--------------
    csw/mgar/pkg/wmf/trunk/Makefile

Modified: csw/mgar/pkg/wmf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wmf/trunk/Makefile	2011-02-20 14:05:04 UTC (rev 13416)
+++ csw/mgar/pkg/wmf/trunk/Makefile	2011-02-20 15:38:40 UTC (rev 13417)
@@ -109,6 +109,9 @@
 RUNTIME_DEP_PKGS_CSWlibwmfgtk += CSWlibwmflite0-2-7
 BUILD_DEP_PKGS += CSWgtk2devel
 
+# This *must* be the same as in the GD package
+CSW_DEFAULT_FONTPATH = $(sharedstatedir)/fonts/truetype
+
 BUILD64 = 1
 NOISAEXEC = 1
 
@@ -130,13 +133,15 @@
 
 MERGE_DIRS_isa-extra = $(libdir)
 
-# default fontpath for unix systems = /usr/share/fonts/truetype
-# Are our fonts picked up correctly?
-CHECKPKG_OVERRIDES_CSWlibwmf-dev += file-with-bad-content|/usr/share|root/opt/csw/include/libwmf/gd/gd.h
-CHECKPKG_OVERRIDES_CSWlibwmf0-2-7 += file-with-bad-content|/usr/share|root/opt/csw/lib/libwmf-0.2.so.7.1.0
-CHECKPKG_OVERRIDES_CSWlibwmf0-2-7 += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libwmf-0.2.so.7.1.0
-
 # These are just docs
 CHECKPKG_OVERRIDES_CSWlibwmfdoc += file-with-bad-content
 
 include gar/category.mk
+
+# Make sure GDFONTPATH is set correctly
+post-extract-modulated:
+	perl -pi -e 's,/usr/share/fonts/truetype,$(CSW_DEFAULT_FONTPATH),' \
+		$(WORKSRC)/src/extra/gd/gd.h \
+		$(WORKSRC)/src/extra/gd/gdft.c
+	@$(MAKECOOKIE)
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.