Commit 17c84aa7 authored by Richard Levitte's avatar Richard Levitte
Browse files

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: default avatarAndy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4179)
parent 34a5b7d7

Configurations/unix-Makefile.tmpl

+6 −6
Original line number Diff line number Diff line
@@ -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