diff options
| author | Richard Levitte <levitte@openssl.org> | 2015-12-07 15:45:50 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2015-12-07 16:12:22 +0100 |
| commit | 4a544810f08539f1549eea9be36bd878c67c8e26 (patch) | |
| tree | f0457554d3f1d18153bc00329a68e90182a4d6d4 /Makefile.org | |
| parent | 5fa30720e481e62d14c113f502db1a76cf5dd221 (diff) | |
| download | openssl-4a544810f08539f1549eea9be36bd878c67c8e26.tar.gz | |
Small changes to creating dists
Make TARFILE include ../ instead of having that hard coded all over the place.
When transforming file names in TAR_COMMAND, use $(NAME) instead of openssl-$(VERSION)
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'Makefile.org')
| -rw-r--r-- | Makefile.org | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/Makefile.org b/Makefile.org index 4ad6bf6bab..1636db860f 100644 --- a/Makefile.org +++ b/Makefile.org @@ -172,8 +172,7 @@ SHARED_LDFLAGS= GENERAL= Makefile BASENAME= openssl NAME= $(BASENAME)-$(VERSION) -TARFILE= $(NAME).tar -WTARFILE= $(NAME)-win.tar +TARFILE= ../$(NAME).tar HEADER= e_os.h # Directories created on install if they don't exist. @@ -493,38 +492,35 @@ TABLE: Configure Configurations/*.conf # would occur. Therefore the list of files is temporarily stored into a file # and read directly, requiring GNU-Tar. Call "make TAR=gtar dist" if the normal # tar does not support the --files-from option. -TAR_COMMAND=$(TAR) $(TARFLAGS) --files-from ../$(TARFILE).list \ +TAR_COMMAND=$(TAR) $(TARFLAGS) --files-from $(TARFILE).list \ --owner openssl:0 --group openssl:0 \ - --transform 's|^|openssl-$(VERSION)/|' \ + --transform 's|^|$(NAME)/|' \ -cvf - -../$(TARFILE).list: +$(TARFILE).list: find * \! -name STATUS \! -name TABLE \! -name '*.o' \! -name '*.a' \ \! -name '*.so' \! -name '*.so.*' \! -name 'openssl' \ \! -name '*test' \! -name '.#*' \! -name '*~' \ - | sort > ../$(TARFILE).list + | sort > $(TARFILE).list -tar: ../$(TARFILE).list +tar: $(TARFILE).list 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 - $(TAR_COMMAND) | gzip --best >../$(TARFILE).gz - rm -f ../$(TARFILE).list - ls -l ../$(TARFILE).gz + $(TAR_COMMAND) | gzip --best > $(TARFILE).gz + rm -f $(TARFILE).list + ls -l $(TARFILE).gz -tar-snap: ../$(TARFILE).list - $(TAR_COMMAND) > ../$(TARFILE) - rm -f ../$(TARFILE).list - ls -l ../$(TARFILE) +tar-snap: $(TARFILE).list + $(TAR_COMMAND) > $(TARFILE) + rm -f $(TARFILE).list + ls -l $(TARFILE) dist: $(PERL) Configure dist - @$(MAKE) dist_pem_h @$(MAKE) SDIRS='$(SDIRS)' clean - @$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' tar - -dist_pem_h: - (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean) + @$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' \ + TARFILE='$(TARFILE)' NAME='$(NAME)' tar install: all install_docs install_sw |