SF.net SVN: gar:[24909] csw/mgar/pkg/389-admin/trunk/Makefile

[cgrzemba at users.sourceforge.net]

Revision: 24909
          http://sourceforge.net/p/gar/code/24909
Author:   cgrzemba
Date:     2015-04-29 07:53:07 +0000 (Wed, 29 Apr 2015)
Log Message:
-----------
389-admin/trunk: set BUILD_ISAS for 64bit builds

Modified Paths:
--------------
    csw/mgar/pkg/389-admin/trunk/Makefile

Modified: csw/mgar/pkg/389-admin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-admin/trunk/Makefile	2015-04-28 22:12:13 UTC (rev 24908)
+++ csw/mgar/pkg/389-admin/trunk/Makefile	2015-04-29 07:53:07 UTC (rev 24909)
@@ -17,7 +17,7 @@
 DISTFILES  = $(DISTNAME).tar.gz
 DISTFILES += CSW389-admin.preremove
 
-BUILD64	= 1
+BUILD64_ONLY = 1
 PACKAGING_PLATFORMS += solaris10-sparc
 PACKAGING_PLATFORMS += solaris10-i386
 
@@ -117,10 +117,13 @@
 CONFIGURE_ARGS += --with-nss-lib=$(libdir)
 CONFIGURE_ARGS += --with-nss-inc=$(includedir)/nss 
 CONFIGURE_ARGS += --with-apxs=/opt/csw/bin/apxs
-CONFIGURE_ARGS += --with-httpd=/opt/csw/sbin/httpd
-CONFIGURE_ARGS += --with-modnss-lib=/opt/csw/lib//apache2/modules
+CONFIGURE_ARGS_32 += --with-httpd=/opt/csw/sbin/httpd
+CONFIGURE_ARGS_32 += --with-modnss-lib=/opt/csw/lib/apache2/modules
+CONFIGURE_ARGS_64 += --with-httpd=/opt/csw/sbin/$(BUILD_ISAS)/httpd
+CONFIGURE_ARGS_64 += --with-modnss-lib=/opt/csw/lib/$(BUILD_ISAS)/apache2/modules
 CONFIGURE_ARGS += --with-modnss-bin=/opt/csw/sbin
 # CONFIGURE_ARGS += --with-adminutil=/opt/csw
+CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MEMORYMODEL_$(BUILD_ISAS)))
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(LDAP_API))
 
 

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