[csw-devel] SF.net SVN: gar:[9916] csw/mgar/pkg/x11/lib/xrender/trunk/Makefile
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Tue May 18 17:45:14 CEST 2010
Revision: 9916
http://gar.svn.sourceforge.net/gar/?rev=9916&view=rev
Author: dmichelsen
Date: 2010-05-18 15:45:14 +0000 (Tue, 18 May 2010)
Log Message:
-----------
x11/lib/xrender: Fixes for cswx11/sunwx11
Modified Paths:
--------------
csw/mgar/pkg/x11/lib/xrender/trunk/Makefile
Modified: csw/mgar/pkg/x11/lib/xrender/trunk/Makefile
===================================================================
--- csw/mgar/pkg/x11/lib/xrender/trunk/Makefile 2010-05-18 15:44:10 UTC (rev 9915)
+++ csw/mgar/pkg/x11/lib/xrender/trunk/Makefile 2010-05-18 15:45:14 UTC (rev 9916)
@@ -37,8 +37,15 @@
SPKG_DESC_CSWcxlibxrender = $(DESCRIPTION) (bound against OpenCSW X11)
SPKG_DESC_CSWcxlibxrenderdevel = $(DESCRIPTION) Development Package (bound against OpenCSW X11)
-PKGFILES_CSWlibxrenderdevel = $(PKGFILES_DEVEL)
+prefix_cswx11 = $(BUILD_PREFIX)/X11
+prefix = $(or $(prefix_$(X11)),$(BUILD_PREFIX))
+STRIP_LIBTOOL = 1
+
+BUILD64 = 1
+NOISALIST = 1
+CONFIGURE_ARGS = $(DIRPATHS)
+
MERGE_SCRIPTS_isa-default-x11-sunwx11 = copy-all
MERGE_SCRIPTS_isa-default64-x11-sunwx11 = copy-relocated-only
MERGE_DIRS_isa-default64-x11-sunwx11 = $(libdir)
@@ -47,15 +54,7 @@
MERGE_SCRIPTS_isa-default64-x11-cswx11 = copy-relocated-only
MERGE_DIRS_isa-default64-x11-cswx11 = $(libdir)
-BUILD64 = 1
-NOISALIST = 1
-CONFIGURE_ARGS = $(DIRPATHS)
+PKGFILES_CSWlibxrenderdevel = $(PKGFILES_DEVEL)
-STRIP_LIBTOOL = 1
-
include gar/category.mk
-# this needs to be after the include as it's not a ?= in the x11
-# category...
-prefix_cswx11 = $(BUILD_PREFIX)/X11
-prefix = $(or $(prefix_$(X11)),$(BUILD_PREFIX))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list