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

[cgrzemba at users.sourceforge.net]

Revision: 16646
          http://gar.svn.sourceforge.net/gar/?rev=16646&view=rev
Author:   cgrzemba
Date:     2012-01-02 12:53:59 +0000 (Mon, 02 Jan 2012)
Log Message:
-----------
mozldap/trunk: unset CPPFLAGS because contention with openldap includes

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

Modified: csw/mgar/pkg/mozldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mozldap/trunk/Makefile	2012-01-02 10:59:27 UTC (rev 16645)
+++ csw/mgar/pkg/mozldap/trunk/Makefile	2012-01-02 12:53:59 UTC (rev 16646)
@@ -23,6 +23,7 @@
 
 PACKAGING_PLATFORMS += solaris10-sparc
 # PACKAGING_PLATFORMS += solaris10-i386
+GARCOMPILER = SOS12U2
 
 PACKAGES += CSWlibldap60
 CATALOGNAME_CSWlibldap60 = libldap60
@@ -120,14 +121,17 @@
 CONFIGURE_ARGS_OPT += --enable-optimize="-xO3"
 CONFIGURE_ARGS_OPT += --disable-debug
 CONFIGURE_ARGS_OPT += --enable-strip
-CONFIGURE_ARGS_OPT += --with-nss-inc=$(includedir)/nss
+CONFIGURE_ARGS_OPT += --with-nss-inc=$(prefix)/include/nss
 CONFIGURE_ARGS_OPT += --with-nss-lib=$(libdir)
-CONFIGURE_ARGS_OPT += --with-nspr-inc=$(includedir)/nspr
+CONFIGURE_ARGS_OPT += --with-nspr-inc=$(prefix)/include/nspr
 CONFIGURE_ARGS_OPT += --with-nspr-lib=$(libdir)
-CONFIGURE_ARGS_OPT += --with-svrcore-inc=$(includedir)/nspr
+CONFIGURE_ARGS_OPT += --with-svrcore-inc=$(prefix)/include/nspr
 CONFIGURE_ARGS_OPT += --with-svrcore-lib=$(libdir)
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR))
+CONFIGURE_ARGS_OPT += --includedir=$(prefix)/include/ldap
 
+CPPFLAGS=
+
 CONFIGURE_SCRIPTS = c-sdk
 BUILD_SCRIPTS = c-sdk
 INSTALL_SCRIPTS = c-sdk

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