[csw-devel] SF.net SVN: gar:[8414] csw/mgar/pkg/oracle-instantclient/trunk/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 8414
          http://gar.svn.sourceforge.net/gar/?rev=8414&view=rev
Author:   dmichelsen
Date:     2010-02-08 15:33:37 +0000 (Mon, 08 Feb 2010)

Log Message:
-----------
oracle-instantclient: Change layout

Modified Paths:
--------------
    csw/mgar/pkg/oracle-instantclient/trunk/Makefile

Modified: csw/mgar/pkg/oracle-instantclient/trunk/Makefile
===================================================================
--- csw/mgar/pkg/oracle-instantclient/trunk/Makefile	2010-02-08 14:45:19 UTC (rev 8413)
+++ csw/mgar/pkg/oracle-instantclient/trunk/Makefile	2010-02-08 15:33:37 UTC (rev 8414)
@@ -10,13 +10,17 @@
 # manually and put into /home/src before packaging.
 MASTER_SITES = manual://
 
-DISTFILES_sparc-32 = basic-10.2.0.4.0-solaris-sparc32.zip sdk-10.2.0.4.0-solaris-sparc32.zip
-DISTFILES_sparc-64 = basic-10.2.0.4.0-solaris-sparc64.zip sdk-10.2.0.4.0-solaris-sparc64.zip
-DISTFILES_i386-32 = instantclient-basic-solaris-x86-6432-10.2.0.2-20060526.zip instantclient-sdk-solaris-x86-6432-10.2.0.2-20060526.zip
-DISTFILES_i386-64 = instantclient-basic-solaris-x86-64-10.2.0.2-2006-05-26.zip instantclient-sdk-solaris-x86-64-10.2.0.2-2006-05-26.zip
+DISTFILES_sparc-32-instantclient = basic-10.2.0.4.0-solaris-sparc32.zip
+DISTFILES_sparc-32-sdk = sdk-10.2.0.4.0-solaris-sparc32.zip
+DISTFILES_sparc-64-instantclient = basic-10.2.0.4.0-solaris-sparc64.zip
+DISTFILES_sparc-64-sdk = sdk-10.2.0.4.0-solaris-sparc64.zip
+DISTFILES_i386-32-instantclient = instantclient-basic-solaris-x86-6432-10.2.0.2-20060526.zip
+DISTFILES_i386-32-sdk = instantclient-sdk-solaris-x86-6432-10.2.0.2-20060526.zip
+DISTFILES_i386-64-instantclient = instantclient-basic-solaris-x86-64-10.2.0.2-2006-05-26.zip
+DISTFILES_i386-64-sdk = instantclient-sdk-solaris-x86-64-10.2.0.2-2006-05-26.zip
 
-DISTFILES  = $(foreach A,sparc i386,$(foreach S,32 64,$(DISTFILES_$A-$S)))
-NOEXTRACT  = $(filter-out $(DISTFILES_$(GARCH)-32) $(DISTFILES_$(GARCH)-64),$(DISTFILES))
+DISTFILES  = $(foreach A,sparc i386,$(foreach S,32 64,$(foreach T,instantclient sdk,$(DISTFILES_$A-$S-$T))))
+NOEXTRACT  = $(filter-out $(foreach S,32 64,$(foreach T,instantclient sdk,$(DISTFILES_$(GARCH)-$S-$T))),$(DISTFILES))
 
 BUILD_DEP_PKGS = CSWchrpath
 
@@ -53,18 +57,26 @@
 	@mkdir -p $$(COOKIEDIR)/$$(@D) && date >> $$(COOKIEDIR)/$$@
 endef
 
+TARGETDIR_32 = .
+TARGETDIR_64 = 64
+
+MERGE_SCRIPTS_isa-default = copy-all
+MERGE_SCRIPTS_isa-default64 = copy-all
+
 include gar/category.mk
 
-$(foreach A,sparc i386,$(foreach S,32 64,$(foreach F,$(DISTFILES_$A-$S),$(eval $(call custom-zip-extract,$F,$A-$S)))))
+$(foreach A,sparc i386,$(foreach S,32 64,$(foreach T,instantclient sdk,$(foreach F,$(DISTFILES_$A-$S-$T),$(eval $(call custom-zip-extract,$F,$A-$S))))))
 
 install-custom:
 	@echo " ==> Installing $(GARNAME)"
-	ginstall -d $(DESTDIR)$(bindir)
+	#ginstall -d $(DESTDIR)$(bindir)
 	#ginstall $(WORKDIR)/$(GARCH)-$(MEMORYMODEL)/instantclient_10_2/genezi $(DESTDIR)$(bindir)
 	#chrpath -r $(libdir) $(DESTDIR)$(bindir)/genezi
-	ginstall -d $(DESTDIR)$(libdir)
-	ginstall $(WORKDIR)/$(GARCH)-$(MEMORYMODEL)/instantclient_10_2/*.so* $(DESTDIR)$(libdir)
-	ginstall $(WORKDIR)/$(GARCH)-$(MEMORYMODEL)/instantclient_10_2/*.jar $(DESTDIR)$(libdir)
-	ginstall -d $(DESTDIR)$(includedir)/oracle/10.2/
-	ginstall $(WORKDIR)/$(GARCH)-$(MEMORYMODEL)/instantclient_10_2/sdk/include/* $(DESTDIR)$(includedir)/oracle/10.2/
+	#ginstall -d $(DESTDIR)$(libdir)
+	#ginstall $(WORKDIR)/$(GARCH)-$(MEMORYMODEL)/instantclient_10_2/*.so* $(DESTDIR)$(libdir)
+	#ginstall $(WORKDIR)/$(GARCH)-$(MEMORYMODEL)/instantclient_10_2/*.jar $(DESTDIR)$(libdir)
+	#ginstall -d $(DESTDIR)$(includedir)/oracle/10.2/
+	#ginstall $(WORKDIR)/$(GARCH)-$(MEMORYMODEL)/instantclient_10_2/sdk/include/* $(DESTDIR)$(includedir)/oracle/10.2/
+	ginstall -d $(DESTDIR)$(prefix)/instantclient_10_2/$(TARGETDIR_$(MEMORYMODEL))
+	cp -r $(WORKDIR)/$(GARCH)-$(MEMORYMODEL)/instantclient_10_2/* $(DESTDIR)$(prefix)/instantclient_10_2/$(TARGETDIR_$(MEMORYMODEL))/
 	@$(MAKECOOKIE)


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