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

[dmichelsen at users.sourceforge.net]

Revision: 15216
          http://gar.svn.sourceforge.net/gar/?rev=15216&view=rev
Author:   dmichelsen
Date:     2011-07-25 11:10:16 +0000 (Mon, 25 Jul 2011)

Log Message:
-----------
apr: Fixup build-1 for 64 bit

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

Modified: csw/mgar/pkg/apr/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apr/trunk/Makefile	2011-07-24 18:06:15 UTC (rev 15215)
+++ csw/mgar/pkg/apr/trunk/Makefile	2011-07-25 11:10:16 UTC (rev 15216)
@@ -32,9 +32,13 @@
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-threads
 CONFIGURE_ARGS += --enable-other-child
+CONFIGURE_ARGS += --with-installbuilddir=$(datadir)/$(MM_LIBDIR)/build-1
 
+MERGEBASE_/opt/csw/share/64 = $(datadir)
+EXTRA_MERGE_DIRS_isa-extra = $(abspath $(datadir)/$(MM_LIBDIR))
+
 include gar/category.mk
 
 post-install-modulated:
 	perl -pi -e 's,/usr/local/lib,$(libdir),g' \
-		$(DESTDIR)/opt/csw/share/build-1/libtool
+		$(DESTDIR)$(datadir)/$(MM_LIBDIR)/build-1/libtool


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