[csw-devel] SF.net SVN: gar:[5214] csw/mgar/gar/v2-relocate/gar.pkg.mk

[valholla at users.sourceforge.net]

Revision: 5214
          http://gar.svn.sourceforge.net/gar/?rev=5214&view=rev
Author:   valholla
Date:     2009-06-09 18:44:02 +0000 (Tue, 09 Jun 2009)

Log Message:
-----------
force basedir of /opt not to relocate

Modified Paths:
--------------
    csw/mgar/gar/v2-relocate/gar.pkg.mk

Modified: csw/mgar/gar/v2-relocate/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2-relocate/gar.pkg.mk	2009-06-09 15:30:19 UTC (rev 5213)
+++ csw/mgar/gar/v2-relocate/gar.pkg.mk	2009-06-09 18:44:02 UTC (rev 5214)
@@ -295,6 +295,10 @@
 # for distributing files to individual packages.
 PROTOTYPE = $(WORKDIR)/prototype
 
+define dontrelocate
+	$(shell gsed -i -e 's,\(.\) .* \($(1)[\s/]*\),\1 norelocate /\2,g' $(2))
+endef
+
 # Dynamic prototypes work like this:
 # - A prototype from DISTFILES takes precedence over 
 
@@ -330,6 +334,7 @@
 	else \
 	  cat $(PROTOTYPE) $(_CSWCLASS_FILTER) $(_PROTOTYPE_FILTER_$*) >$@; \
 	fi
+	$(if $(ALLOW_RELOCATE),$(call dontrelocate,opt,$(PROTOTYPE)))
 
 $(WORKDIR)/%.prototype-$(GARCH): | $(WORKDIR)/%.prototype
 	$(_DBG)cat $(WORKDIR)/$*.prototype $(_PROTOTYPE_FILTER_$*) >$@
@@ -451,7 +456,8 @@
 	echo "VENDOR=$(call pkgvar,SPKG_VENDOR,$*)"; \
 	echo "EMAIL=$(call pkgvar,SPKG_EMAIL,$*)"; \
 	echo "PSTAMP=$(LOGNAME)@$(shell hostname)-$(shell date '+%Y%m%d%H%M%S')"; \
-	echo "CLASSES=$(call pkgvar,SPKG_CLASSES,$*)"; \
+	$(if $(ALLOW_RELOCATE),echo "CLASSES=$(call pkgvar,SPKG_CLASSES,$*) norelocate"; \
+	,echo "CLASSES=$(call pkgvar,SPKG_CLASSES,$*)";) \
 	echo "HOTLINE=http://www.opencsw.org/bugtrack/"; \
 	echo "OPENCSW_REPOSITORY=$(call _URL)@$(call _REVISION)"; \
 	echo "OPENCSW_MODE64=$(call mode64,$*)"; \


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