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>

diff --git a/Makefile.org b/Makefile.org
index 4ad6bf6bab54c339780bc0272a5542a2d632c325..1636db860fd1db36c3689af0c1f97b947aea5353 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -172,8 +172,7 @@ SHARED_LDFLAGS=
 GENERAL=        Makefile
 BASENAME=       openssl
 NAME=           $(BASENAME)-$(VERSION)
 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.
 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.
 # 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 \
                               --owner openssl:0 --group openssl:0 \

-                              --transform 's|^|openssl-$(VERSION)/|' \
+                              --transform 's|^|$(NAME)/|' \

                               -cvf -
 
                               -cvf -
 

-../$(TARFILE).list:
+$(TARFILE).list:

        find * \! -name STATUS \! -name TABLE \! -name '*.o' \! -name '*.a' \
               \! -name '*.so' \! -name '*.so.*'  \! -name 'openssl' \
               \! -name '*test' \! -name '.#*' \! -name '*~' \
        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
        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
 
 dist:   
        $(PERL) Configure dist

-       @$(MAKE) dist_pem_h

        @$(MAKE) SDIRS='$(SDIRS)' clean
        @$(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
 
 
 install: all install_docs install_sw