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

[dmichelsen at users.sourceforge.net]

Revision: 6618
          http://gar.svn.sourceforge.net/gar/?rev=6618&view=rev
Author:   dmichelsen
Date:     2009-09-30 12:55:33 +0000 (Wed, 30 Sep 2009)

Log Message:
-----------
bdb43: Fix TCL includes

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

Modified: csw/mgar/pkg/bdb43/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb43/trunk/Makefile	2009-09-30 08:47:40 UTC (rev 6617)
+++ csw/mgar/pkg/bdb43/trunk/Makefile	2009-09-30 12:55:33 UTC (rev 6618)
@@ -56,13 +56,14 @@
 CONFIGURE_ARGS += --enable-rpc
 CONFIGURE_ARGS += --enable-cxx
 CONFIGURE_ARGS += --enable-java
-CONFIGURE_ARGS += --enable-tcl
-CONFIGURE_ARGS += --with-tcl=$(libdir)
 CONFIGURE_ARGS += --enable-o_direct
 
-LIBTOOL_LADIR   = $(DESTDIR)$(prefix)/bdb43/lib
-STRIP_DIRS     += $(DESTDIR)$(prefix)/bdb43/bin
+# Exclude TCL support for 64 bit until we have a 64 bit TCL
+CONFIGURE_ARGS-mm-32 = --enable-tcl --with-tcl=$(libpath)
+CONFIGURE_ARGS += $(CONFIGURE_ARGS-mm-$(MEMORYMODEL))
 
+FIXCONFIG_DIRS  = $(DESTDIR)$(prefix)/bdb43/lib
+
 # bdb tests are time consuming
 TEST_SCRIPTS =
 
@@ -79,6 +80,6 @@
 export PATH
 
 configure-dist:
-	@( cd $(WORKSRC) ; $(CONFIGURE_ENV) ../dist/configure $(CONFIGURE_ARGS) )
+	( cd $(WORKSRC) ; $(CONFIGURE_ENV) ../dist/configure $(CONFIGURE_ARGS) )
 	@$(MAKECOOKIE)
 


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