summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@behdad.org>2008-09-18 18:33:05 -0400
committerBehdad Esfahbod <behdad@behdad.org>2008-09-18 18:33:56 -0400
commit9eee0e935859082d8798846a8e6b16cbceb1f779 (patch)
tree6350a8c871be5d55b1adbadeef7ecac73ca1a3a8 /build
parentbdaaf3574a596e3ab31d0bdf0f84667d868c10d1 (diff)
[Makefile.am] Move sticky-bit clearing to dist-hook
It's a more natural place. It also means that we just change permissions on the dist directory, not the user's source directory.
Diffstat (limited to 'build')
-rw-r--r--build/Makefile.am.releasing22
1 files changed, 15 insertions, 7 deletions
diff --git a/build/Makefile.am.releasing b/build/Makefile.am.releasing
index 2f710388..9a03be6a 100644
--- a/build/Makefile.am.releasing
+++ b/build/Makefile.am.releasing
@@ -7,6 +7,14 @@
# To make a quick properly named (date and git hash stamped) tarball:
# make snapshot
+
+dist-hook: dist-clear-sticky-bits
+
+# Clean up any sticky bits we may inherit from parent dir
+dist-clear-sticky-bits:
+ chmod -R a-s $(distdir)
+
+
snapshot:
distdir="$(distdir)-`date '+%Y%m%d'`"; \
test -d "$(srcdir)/.git" && distdir=$$distdir-`cd "$(srcdir)" && git-rev-parse HEAD | cut -c 1-6`; \
@@ -66,14 +74,14 @@ release-verify-newer:
release-remove-old:
$(RM) $(tar_file) $(sha1_file) $(gpg_file)
-# Maybe it's just my system, but somehow group sticky bits keep
-# getting set and this causes failures in un-tarring on some systems.
-# Until I figure out where the sticky bit is coming from, just clean
-# these up before building a release.
-release-cleanup-group-sticky:
- find . -type f | xargs chmod g-s
-release-check: release-verify-sane-changelogs release-verify-sane-tests release-verify-even-micro release-verify-newer release-remove-old release-cleanup-group-sticky distcheck
+release-check: \
+ release-verify-sane-changelogs \
+ release-verify-sane-tests \
+ release-verify-even-micro \
+ release-verify-newer \
+ release-remove-old \
+ distcheck
release-upload: release-check $(tar_file) $(sha1_file) $(gpg_file)
mkdir -p releases