diff options
| author | Richard Levitte <levitte@openssl.org> | 2017-08-17 14:04:36 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2017-08-18 15:16:30 +0200 |
| commit | 17c84aa763b1d69c5446542bf9b4e2f642c570f2 (patch) | |
| tree | 068823e6b37ef1b9d3cc831b7c310ca3f5ce20ab | |
| parent | 34a5b7d727204eb990acd44899d457245ac94d7c (diff) | |
Prepare tarball in dist directory
We changed directory to the wrong directory.
This change also separates the preparation phase from the tarball
building phase.
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4179)
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index a49e06c91a..f56237c591 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -691,17 +691,17 @@ tar: excl_re="^(fuzz/corpora|`echo $$excl_re | sed -e 's/ /$$|/g'`\$$)"; \ echo "$$excl_re"; \ git ls-tree -r --name-only --full-tree HEAD \ - | grep -v -E "$$excl_re" \ + | egrep -v "$$excl_re" \ | while read F; do \ mkdir -p $$TMPDIR/$$DISTDIR/`dirname $$F`; \ cp $$F $$TMPDIR/$$DISTDIR/$$F; \ done); \ - (cd $$TMPDIR; \ + (cd $$TMPDIR/$$DISTDIR; \ $(PREPARE_CMD); \ - find $$TMPDIR/$$DISTDIR -type d -print | xargs chmod 755; \ - find $$TMPDIR/$$DISTDIR -type f -print | xargs chmod a+r; \ - find $$TMPDIR/$$DISTDIR -type f -perm -0100 -print | xargs chmod a+x; \ - $(TAR_COMMAND) $$DISTDIR) \ + find . -type d -print | xargs chmod 755; \ + find . -type f -print | xargs chmod a+r; \ + find . -type f -perm -0100 -print | xargs chmod a+x); \ + (cd $$TMPDIR; $(TAR_COMMAND) $$DISTDIR) \ | (cd $(SRCDIR); gzip --best > $(TARFILE).gz); \ rm -rf $$TMPDIR cd $(SRCDIR); ls -l $(TARFILE).gz |