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:37:14 +0200 |
| commit | 70c0b541b940349a0cfdc903f4491aa55f6fda0c (patch) | |
| tree | 9a6e71a718f4f63fdd2cc242b8ce2ae6a7396b46 /Configurations | |
| parent | a50c4aa6d7b02c1e5703da61d0c9302f8a7f0e45 (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)
(cherry picked from commit 17c84aa763b1d69c5446542bf9b4e2f642c570f2)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index dca2b04305..e02eaa136b 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -663,12 +663,12 @@ tar: 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 |