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

[dmichelsen at users.sourceforge.net]

Revision: 3463
          http://gar.svn.sourceforge.net/gar/?rev=3463&view=rev
Author:   dmichelsen
Date:     2009-02-24 15:18:34 +0000 (Tue, 24 Feb 2009)

Log Message:
-----------
bdb44: Fix merging

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

Modified: csw/mgar/pkg/bdb44/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb44/trunk/Makefile	2009-02-24 15:07:24 UTC (rev 3462)
+++ csw/mgar/pkg/bdb44/trunk/Makefile	2009-02-24 15:18:34 UTC (rev 3463)
@@ -23,17 +23,6 @@
 
 SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html
 
-CATALOGNAME_CSWbdb44 = berkeleydb44
-CATALOGNAME_CSWbdb44-devel = berkeleydb44_devel
-CATALOGNAME_CSWbdb44-doc = berkeleydb44_doc
-
-SPKG_DESC_CSWbdb44 = BerkeleyDB 4.4 embedded database libraries and utilities
-SPKG_DESC_CSWbdb44-devel = BerkeleyDB 4.4 development support
-SPKG_DESC_CSWbdb44-doc = BerkeleyDB 4.4 documentation
-
-REQUIRED_PKGS_CSWbdb44-devel = CSWbdb44
-INCOMPATIBLE_PKGS_CSWbdb44-doc = CSWbdb44doc
-
 WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/build_unix
 
 PATCHDIR = $(WORKSRC)/..
@@ -44,7 +33,8 @@
 
 CONFIGURE_SCRIPTS = dist
 
-CONFIGURE_ARGS  = --prefix=$(prefix)/bdb44
+prefix = $(BUILD_PREFIX)/bdb44
+CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --disable-cryptography
 CONFIGURE_ARGS += --enable-compat185
 CONFIGURE_ARGS += --enable-o_direct
@@ -64,15 +54,28 @@
 TEST_SCRIPTS =
 
 NO_ISAEXEC = 1
-MERGE_EXCLUDE_FILES = .*~ .*\.la
-ISA_RELOCATE_DIRS_sparcv9 = $(prefix)/bdb44/bin $(prefix)/bdb44/lib $(prefix)/bdb44/include
-ISA_RELOCATE_DIRS_amd64   = $(prefix)/bdb44/bin $(prefix)/bdb44/lib $(prefix)/bdb44/include
 
-PKGFILES_CSWbdb44-doc = $(prefix)/bdb44/docs/.*
+PACKAGES = CSWbdb44 CSWbdb44-devel CSWbdb44-doc
 
-PKGFILES_CSWbdb44-devel = $(prefix)/bdb44/include/.*
-PKGFILES_CSWbdb44-devel += $(prefix)/bdb44/lib/.*\.a
+CATALOGNAME_CSWbdb44       = berkeleydb44
+CATALOGNAME_CSWbdb44-devel = berkeleydb44_devel
+CATALOGNAME_CSWbdb44-doc   = berkeleydb44_doc
 
+ARCHALL_CSWbdb44-doc = 1
+
+SPKG_DESC_CSWbdb44       = BerkeleyDB 4.4 embedded database libraries and utilities
+SPKG_DESC_CSWbdb44-devel = BerkeleyDB 4.4 development support
+SPKG_DESC_CSWbdb44-doc   = BerkeleyDB 4.4 documentation
+
+REQUIRED_PKGS_CSWbdb44-devel = CSWbdb44
+INCOMPATIBLE_PKGS_CSWbdb44-doc = CSWbdb44doc
+
+LICENSE = LICENSE
+
+PKGFILES_CSWbdb44-doc = $(prefix)/docs/.*
+
+PKGFILES_CSWbdb44-devel = $(PKGFILES_DEVEL)
+
 include gar/category.mk
 
 LIBS += -lnsl
@@ -82,10 +85,10 @@
 export PATH
 
 configure-dist:
-	@( cd $(WORKSRC) ; $(CONFIGURE_ENV) ../dist/configure $(CONFIGURE_ARGS) )
+	( cd $(WORKSRC) ; $(CONFIGURE_ENV) ../dist/configure $(CONFIGURE_ARGS) )
 	@$(MAKECOOKIE)
 
 post-merge:
-	gln -s . $(PKGROOT)$(prefix)/bdb44/lib/32
-	gln -s $(ISA_DEFAULT64) $(PKGROOT)$(prefix)/bdb44/lib/64
+	gln -s . $(PKGROOT)$(libdir)/32
+	gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64
 	@$(MAKECOOKIE)


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