Rework building: VMS changes to handle extensions and product names

[openssl.git] / Configurations / unix-Makefile.tmpl

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index c64c154939c19643adf6d8d99155b8ac1c4a1cf5..11fecc259b2f2c50be81a3ab7a88355ca1b68ef1 100644 (file)
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -21,7 +21,7 @@
      # libcrypto.a and use libcrypto_a.a as static one.
      sub sharedaix  { !$disabled{shared} && $config{target} =~ /^aix/ }
 
-     our $sover_dirname = $config{shlib_version_number};
+     our $sover_dirname = $config{shlib_version};
      $sover_dirname =~ s|\.|_|g
          if $config{target} =~ /^mingw/;
 
@@ -88,13 +88,10 @@ CONFIGURE_ARGS=({- join(", ",quotify_l(@{$config{perlargv}})) -})
 SRCDIR={- $config{sourcedir} -}
 BLDDIR={- $config{builddir} -}
 
-VERSION={- $config{version} -}
+VERSION={- "$config{full_version}" -}
 MAJOR={- $config{major} -}
 MINOR={- $config{minor} -}
-SHLIB_VERSION_NUMBER={- $config{shlib_version_number} -}
-SHLIB_VERSION_HISTORY={- $config{shlib_version_history} -}
-SHLIB_MAJOR={- $config{shlib_major} -}
-SHLIB_MINOR={- $config{shlib_minor} -}
+SHLIB_VERSION_NUMBER={- $config{shlib_version} -}
 SHLIB_TARGET={- $target{shared_target} -}
 SHLIB_EXT={- $shlibext -}
 SHLIB_EXT_SIMPLE={- $shlibextsimple -}
@@ -231,6 +228,7 @@ TARFLAGS= {- $target{TARFLAGS} -}
 
 BASENAME=       openssl
 NAME=           $(BASENAME)-$(VERSION)
+# Relative to $(SRCDIR)
 TARFILE=        ../$(NAME).tar
 
 ##### Project flags ##################################################
@@ -872,37 +870,8 @@ tags TAGS: FORCE
 
 # Release targets (note: only available on Unix) #####################
 
-# If your tar command doesn't support --owner and --group, make sure to
-# use one that does, for example GNU tar
-TAR_COMMAND=$(TAR) $(TARFLAGS) --owner 0 --group 0 -cf -
-PREPARE_CMD=:
 tar:
-       set -e; \
-       TMPDIR=/var/tmp/openssl-copy.$$$$; \
-       DISTDIR=$(NAME); \
-       mkdir -p $$TMPDIR/$$DISTDIR; \
-       (cd $(SRCDIR); \
-        excl_re=`git submodule status | sed -e 's/^.//' | cut -d' ' -f2`; \
-        excl_re="^(fuzz/corpora|Configurations/.*\.norelease\.conf|`echo $$excl_re | sed -e 's/ /$$|/g'`\$$)"; \
-        echo "$$excl_re"; \
-        git ls-tree -r --name-only --full-tree HEAD \
-        | egrep -v "$$excl_re" \
-        | while read F; do \
-              mkdir -p $$TMPDIR/$$DISTDIR/`dirname $$F`; \
-              cp $$F $$TMPDIR/$$DISTDIR/$$F; \
-          done); \
-       (cd $$TMPDIR/$$DISTDIR; \
-        $(PREPARE_CMD); \
-        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
-
-dist:
-       @$(MAKE) PREPARE_CMD='$(PERL) ./Configure dist' TARFILE="$(TARFILE)" NAME="$(NAME)" tar
+       (cd $(SRCDIR); ./util/mktar.sh --name='$(NAME)' --tarfile='$(TARFILE)')
 
 # Helper targets #####################################################