[csw-devel] SF.net SVN: gar:[10250] csw/mgar/pkg/TEMPLATES/createpkg/Makefile.lib

[theferret at users.sourceforge.net]

Revision: 10250
          http://gar.svn.sourceforge.net/gar/?rev=10250&view=rev
Author:   theferret
Date:     2010-06-17 18:21:08 +0000 (Thu, 17 Jun 2010)

Log Message:
-----------
TEMPLATES: minor tweak

Modified Paths:
--------------
    csw/mgar/pkg/TEMPLATES/createpkg/Makefile.lib

Modified: csw/mgar/pkg/TEMPLATES/createpkg/Makefile.lib
===================================================================
--- csw/mgar/pkg/TEMPLATES/createpkg/Makefile.lib	2010-06-17 18:16:16 UTC (rev 10249)
+++ csw/mgar/pkg/TEMPLATES/createpkg/Makefile.lib	2010-06-17 18:21:08 UTC (rev 10250)
@@ -41,18 +41,21 @@
 # to arch-specific target
 CONFIGURE=./configure --prefix=/opt/csw --enable-static=no
 
-CONFIGURE_64_sparc= --libexecdir=/opt/csw/libexec/sparcv9
-CONFIGURE_64_i386= --libexecdir=/opt/csw/libexec/amd64
-CONFIGURE_64_EXTRAS:= --libdir=/opt/csw/lib/64 $(CONFIGURE_64_$(ARCH))
+LIBDIR64_sparc:=/opt/csw/lib/sparcv9
+LIBDIR64_i386 :=/opt/csw/lib/amd64
 
-LDFLAGS_64_sparc := -R/opt/csw/lib/sparcv9 -L/opt/csw/lib/sparcv9
-LDFLAGS_64_i386  := -R/opt/csw/lib/amd64 -L/opt/csw/lib/amd64
+CONFIGURE_64_$(ARCH) := --libdir=$(LIBDIR64_$(ARCH))
+CONFIGURE_64_EXTRAS  := $(CONFIGURE_64_$(ARCH))
 
+LDFLAGS_64_$(ARCH) := -R$(LIBDIR64_$(ARCH)) -L$(LIBDIR64_$(ARCH))
 
+
+
 CREATEPKG=createpkg -r `pwd`/build/*/cswstage
 
 
 all:	$(ARCH)-32 build/.stage1 $(ARCH)-64 package
+#all:	$(ARCH)-32 package
 
 # ARCH-XX handles configure, build, and stage for its own combo
 # 
@@ -61,7 +64,9 @@
 
 
 
-extract:
+extract:	build/.extract.done
+
+build/.extract.done:
 	test -d build || mkdir build
 	@if test -f  $(ARCHIVEDIR)/$(ARCHIVENAME) ; then \
 		echo Extracting $(ARCHIVENAME) under build dir... ;\
@@ -69,6 +74,7 @@
 	else echo Cannot extract - $(ARCHIVEDIR)/$(ARCHIVENAME) does not exist ;\
 		exit 1; \
 	fi
+	touch build/.extract.done
 	
 
 clean distclean:
@@ -125,10 +131,9 @@
 
 build/.$(ARCH)-64.done:	$(ARCH)-64
 
-
 # Since we share the same src tree, we should only need to
 # pre-configure patching one time for all.
-build/.patch-preconf.done:
+build/.patch-preconf.done:	build/.extract.done
 	if test -f patchfile.preconf ; then \
 	 gpatch -d $(SRCDIR) -p0  <patchfile.preconf ; fi
 	touch $@
@@ -155,7 +160,7 @@
 	  CFLAGS="$(CFLAGS_COMMON) -m64"  \
 	  CXXFLAGS="$(CXXFLAGS_COMMON) -m64" \
 	  LDFLAGS="$(LDFLAGS_64_$(ARCH))" \
-	  PKG_CONFIG_PATH=/opt/csw/lib/64 \
+	  PKG_CONFIG_PATH=/opt/csw/lib/64/pkgconfig \
 	  $(CONFIGURE) $(CONFIGURE_64_EXTRAS)  )
 	if test -f patchfile.postconf ; then \
 	 gpatch -d $(SRCDIR) -p0  <patchfile.postconf ; fi
@@ -176,6 +181,7 @@
 build/.stage-$(ARCH)-32.done:
 	@echo Handling stage of $(ARCH)-32
 	(cd $(SRCDIR) ; MAKE=gmake stagepkg)
+	(cd  $(SRCDIR); cp COPYING cswstage/.)
 	@rm -f build/.*64.done
 	touch $@
 
@@ -189,10 +195,10 @@
 # SO, odds are you'll have to write a customized target
 build/.stage-$(ARCH)-64.done:	$(SRCDIR)/cswstage
 	@echo ""
-	@echo debug: Using generic stage-64 routines
-	@echo relying on customized prototype file
-	@(cd $(SRCDIR)/*/.libs;  tar cf - lib*.so.*.*.* ) | (cd $(SRCDIR)/cswstage ; tar xf -)
-	@(cd $(SRCDIR); cp *.pc cswstage)
+	rm -rf cd $(SRCDIR)/tmpdest
+	cd $(SRCDIR) &&  $(MAKE) DESTDIR=`/bin/pwd`/tmpdest install
+	(cd $(SRCDIR)/tmpdest; tar cf - ./$(LIBDIR64_$(ARCH)) )| \
+	    (cd $(SRCDIR)/cswstage; tar xvf -)
 	@echo ""
 	touch $@
 


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