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

[cgrzemba at users.sourceforge.net]

Revision: 16779
          http://gar.svn.sourceforge.net/gar/?rev=16779&view=rev
Author:   cgrzemba
Date:     2012-01-16 16:28:47 +0000 (Mon, 16 Jan 2012)
Log Message:
-----------
nss/trunk: fixing sqlite 64bit linking problem

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

Modified: csw/mgar/pkg/nss/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nss/trunk/Makefile	2012-01-16 15:50:09 UTC (rev 16778)
+++ csw/mgar/pkg/nss/trunk/Makefile	2012-01-16 16:28:47 UTC (rev 16779)
@@ -83,10 +83,6 @@
 # To avoid creating /opt/csw/lib/libsqlite3.so (already exists)
 NSS_USE_SYSTEM_SQLITE = 1
 export NSS_USE_SYSTEM_SQLITE
-SQLITE_LIB_DIR = /opt/csw/lib
-export SQLITE_LIB_DIR
-SQLITE_INCLUDE_DIR = /opt/csw/include
-export SQLITE_INCLUDE_DIR
 
 # 64-bit suppport
 ifeq ($(MODULATION),isa-sparcv9)
@@ -104,6 +100,14 @@
 endif
 export NSPR_LIB_DIR
 
+ifeq ($(USE_64),1) 
+SQLITE_LIB_DIR = /opt/csw/lib/64
+else
+SQLITE_LIB_DIR = /opt/csw/lib
+endif
+export SQLITE_LIB_DIR
+SQLITE_INCLUDE_DIR = /opt/csw/include
+export SQLITE_INCLUDE_DIR
 
 # Based on:
 # http://mxr.mozilla.org/security/source/security/nss/pkg/solaris/SUNWtlsu/prototype_com

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