[csw-devel] SF.net SVN: gar:[7019] csw/mgar/gar/v2/gar.mk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Thu Oct 29 16:07:06 CET 2009
Revision: 7019
http://gar.svn.sourceforge.net/gar/?rev=7019&view=rev
Author: dmichelsen
Date: 2009-10-29 15:07:06 +0000 (Thu, 29 Oct 2009)
Log Message:
-----------
mGAR v2: Fix stupid typo in umask application
Modified Paths:
--------------
csw/mgar/gar/v2/gar.mk
Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk 2009-10-29 14:56:26 UTC (rev 7018)
+++ csw/mgar/gar/v2/gar.mk 2009-10-29 15:07:06 UTC (rev 7019)
@@ -746,7 +746,7 @@
# Copy only the merge directories
merge-copy-only: $(PKGROOT)
- $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 & pax -r -w -v $(_PAX_ARGS) \
+ $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 && pax -r -w -v $(_PAX_ARGS) \
$(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/,p") -s ",.*,," \
. $(PKGROOT) \
)
@@ -754,7 +754,7 @@
# Copy the whole tree and relocate the directories in $(MERGE_DIRS)
merge-copy-relocate: $(PKGROOT) $(INSTALLISADIR)
- $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 & pax -r -w -v $(_PAX_ARGS) \
+ $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 && pax -r -w -v $(_PAX_ARGS) \
$(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/$(ISA)/,p") \
. $(PKGROOT) \
)
@@ -762,7 +762,7 @@
# Copy only the relocated directories
merge-copy-relocated-only: $(PKGROOT) $(INSTALLISADIR)
- $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 & pax -r -w -v $(_PAX_ARGS) \
+ $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 && pax -r -w -v $(_PAX_ARGS) \
$(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/$(ISA)/,p") -s ",.*,," \
. $(PKGROOT) \
)
@@ -770,7 +770,7 @@
# Copy
merge-copy-config-only:
- $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 & pax -r -w -v $(_PAX_ARGS) \
+ $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 && pax -r -w -v $(_PAX_ARGS) \
-s ",^\(\.$(bindir)/.*-config\)\$$,\1,p" \
-s ",.*,," \
. $(PKGROOT) \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list