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

[dmichelsen at users.sourceforge.net]

Revision: 4775
          http://gar.svn.sourceforge.net/gar/?rev=4775&view=rev
Author:   dmichelsen
Date:     2009-05-08 23:25:15 +0000 (Fri, 08 May 2009)

Log Message:
-----------
pango: Fix 64 bit x11 libs

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

Modified: csw/mgar/pkg/pango/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pango/trunk/Makefile	2009-05-08 23:10:50 UTC (rev 4774)
+++ csw/mgar/pkg/pango/trunk/Makefile	2009-05-08 23:25:15 UTC (rev 4775)
@@ -20,6 +20,11 @@
 CATALOGNAME_CSWpangodevel = libpango_devel
 CATALOGNAME_CSWpangodoc   = libpango_doc
 
+PREREQUISITE_PKGS = CSWgtk-doc CSWlibxslt CSWglib2devel
+REQUIRED_PKGS_CSWpango  = CSWggettextrt CSWglib2 CSWfconfig CSWftype2
+REQUIRED_PKGS_CSWpango += CSWlibcairo CSWlibxft2 CSWlibxrender CSWzlib CSWlibx11
+REQUIRED_PKGS_CSWpangodevel = CSWpango
+
 SPKG_SOURCEURL = http://www.pango.org/
 
 # We define upstream file regex so we can be notifed of new upstream software release
@@ -31,16 +36,13 @@
 EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
 
 BUILD64 = 1
-NO_ISAEXEC = 1
-CONFIGURE_ARGS   = $(DIRPATHS)
-CONFIGURE_ARGS  += --with-x --enable-gtk-doc
-# CONFIGURE_ARGS  += --with-included-modules 
+NOISALIST = 1
+CONFIGURE_ARGS  = $(DIRPATHS)
+CONFIGURE_ARGS += --with-x --enable-gtk-doc
+CONFIGURE_ARGS += --x-include=$(prefix)/X11/include
+CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
+# CONFIGURE_ARGS += --with-included-modules 
 
-PREREQUISITE_PKGS = CSWgtk-doc CSWlibxslt
-REQUIRED_PKGS_CSWpango  = CSWggettextrt CSWglib2 CSWfconfig CSWftype2
-REQUIRED_PKGS_CSWpango += CSWlibcairo CSWlibxft2 CSWlibxrender CSWzlib CSWlibx11
-REQUIRED_PKGS_CSWpangodevel = CSWpango
-
 # Dynamic prototype
 PKGFILES_CSWpangodevel  = $(PKGFILES_DEVEL)
 PKGFILES_CSWpangodoc    = $(sharedstatedir)/gtk-doc/.*
@@ -48,6 +50,8 @@
 # Do not execute make test step
 TEST_SCRIPTS   = 
 
+EXTRA_MERGE_EXCLUDE_FILES = .*/preload\.1\.gz
+
 include gar/category.mk
 
 post-configure-modulated:


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