From 90a5ffccfe3e1eea6878420f01192bc178cec986 Mon Sep 17 00:00:00 2001 From: Apple Date: Thu, 7 Oct 2010 08:16:42 +0000 Subject: [PATCH] CoreOSMakefiles-64.tar.gz --- Makefile | 2 +- ReleaseControl/Common.make | 7 +------ Standard/Variables.in | 3 ++- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 35ecb3b..c2abae5 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ installhdrs: installsrc: install -d "$(SRCROOT)" - rsync -a --exclude=.svn ./ "$(SRCROOT)" + rsync -a --exclude=.svn --exclude=.git ./ "$(SRCROOT)" clean: $(_v) echo Nothing to clean diff --git a/ReleaseControl/Common.make b/ReleaseControl/Common.make index 0c5fda2..73745fe 100644 --- a/ReleaseControl/Common.make +++ b/ReleaseControl/Common.make @@ -130,12 +130,7 @@ install_source:: ifneq ($(CommonNoInstallSource),YES) @echo "Installing source for $(Project)..." $(_v) $(MKDIR) "$(SRCROOT)" -ifneq ($(wildcard $(PAX)),) - $(_v) $(PAX) -rw . "$(SRCROOT)" -else - $(_v) $(TAR) cf - . | (cd "$(SRCROOT)" ; $(TAR) xfp -) -endif - $(_v) $(FIND) "$(SRCROOT)" $(Find_Cruft) -depth -exec $(RMDIR) "{}" \; + $(_v) $(TAR) -cp $(Tar_Cruft) . | $(TAR) -pox -C "$(SRCROOT)" endif ifndef ShadowTestFile diff --git a/Standard/Variables.in b/Standard/Variables.in index 1bad305..3cff612 100644 --- a/Standard/Variables.in +++ b/Standard/Variables.in @@ -139,8 +139,9 @@ endif ## # Find Garbage ## -Cruft = CVS RCS SCCS *~ .*~ .nfs\* .*.wmd .svn .DS_Store +Cruft = CVS RCS SCCS *~ .*~ .nfs\* .*.wmd .svn .DS_Store .git Find_Cruft = '(' $(Cruft:%=-name '%' -or) -name '' ')' -print +Tar_Cruft = $(Cruft:%=--exclude '%') ## # Install -- 2.47.2