Make Makefiles OSF-make-friendly.

PR: 3165
(cherry picked from commit d1cf23ac86c05b22b8780e2c03b67230564d2d34)

diff --git a/crypto/Makefile b/crypto/Makefile
index 947dd5d44ec5e9698de9539a8878c57891d72898..a90809b2b83333a8f7246f028c738fbe4c44881c 100644 (file)
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -77,7 +77,9 @@ ia64cpuid.s: ia64cpuid.S;     $(CC) $(CFLAGS) -E ia64cpuid.S > $@
 ppccpuid.s:    ppccpuid.pl;    $(PERL) ppccpuid.pl $(PERLASM_SCHEME) $@
 pariscid.s:    pariscid.pl;    $(PERL) pariscid.pl $(PERLASM_SCHEME) $@
 alphacpuid.s:  alphacpuid.pl
-       $(PERL) $< | $(CC) -E - | tee $@ > /dev/null
+       (preproc=/tmp/$$$$.$@; trap "rm $$preproc" INT; \
+       $(PERL) alphacpuid.pl > $$preproc && \
+       $(CC) -E $$preproc > $@ && rm $$preproc)
 
 testapps:
        [ -z "$(THIS)" ] || (   if echo $(SDIRS) | fgrep ' des '; \

diff --git a/crypto/bn/Makefile b/crypto/bn/Makefile
index 672773454cfd400e9bb39c023765d818f7289bb7..6dd136be5d6b7f3d715480158b3955b9b3733217 100644 (file)
--- a/crypto/bn/Makefile
+++ b/crypto/bn/Makefile
@@ -125,7 +125,9 @@ ppc-mont.s: asm/ppc-mont.pl;$(PERL) asm/ppc-mont.pl $(PERLASM_SCHEME) $@
 ppc64-mont.s:  asm/ppc64-mont.pl;$(PERL) asm/ppc64-mont.pl $(PERLASM_SCHEME) $@
 
 alpha-mont.s:  asm/alpha-mont.pl
-       $(PERL) $< | $(CC) -E - | tee $@ > /dev/null
+       (preproc=/tmp/$$$$.$@; trap "rm $$preproc" INT; \
+       $(PERL) asm/alpha-mont.pl > $$preproc && \
+       $(CC) -E $$preproc > $@ && rm $$preproc)
 
 # GNU make "catch all"
 %-mont.s:      asm/%-mont.pl;  $(PERL) $< $(PERLASM_SCHEME) $@

diff --git a/crypto/evp/Makefile b/crypto/evp/Makefile
index 1e46cebf5e769ff3c735fe08b1441bf55b74930e..5d0c6b7db4c9a1a0e89870661576097fc377ecae 100644 (file)
--- a/crypto/evp/Makefile
+++ b/crypto/evp/Makefile
@@ -67,7 +67,7 @@ files:
 links:
        @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
        @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-       [ ! -f $(TESTDATA) ] || cp $(TESTDATA) ../../test
+       @[ -f $(TESTDATA) ] && cp $(TESTDATA) ../../test && echo "$(TESTDATA) -> ../../test/$(TESTDATA)"
        @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
 
 install:

diff --git a/crypto/modes/Makefile b/crypto/modes/Makefile
index c825b12f25853b02a9ed2c45788012db12be080e..3d8bafd5716c8242766a3b9e4e382a4b03ef530f 100644 (file)
--- a/crypto/modes/Makefile
+++ b/crypto/modes/Makefile
@@ -53,7 +53,10 @@ ghash-x86_64.s:      asm/ghash-x86_64.pl
 ghash-sparcv9.s:       asm/ghash-sparcv9.pl
        $(PERL) asm/ghash-sparcv9.pl $@ $(CFLAGS)
 ghash-alpha.s: asm/ghash-alpha.pl
-       $(PERL) $< | $(CC) -E - | tee $@ > /dev/null
+       (preproc=/tmp/$$$$.$@; trap "rm $$preproc" INT; \
+       $(PERL) asm/ghash-alpha.pl > $$preproc && \
+       $(CC) -E $$preproc > $@ && rm $$preproc)
+
 ghash-parisc.s:        asm/ghash-parisc.pl
        $(PERL) asm/ghash-parisc.pl $(PERLASM_SCHEME) $@
 

diff --git a/crypto/sha/Makefile b/crypto/sha/Makefile
index 6d191d3936ee84523d97787c69e7e020981500a6..2eb2b7af992bf6897e42b744e1139febb12b17ab 100644 (file)
--- a/crypto/sha/Makefile
+++ b/crypto/sha/Makefile
@@ -60,7 +60,9 @@ sha256-armv4.S: asm/sha256-armv4.pl
        $(PERL) $< $(PERLASM_SCHEME) $@
 
 sha1-alpha.s:  asm/sha1-alpha.pl
-       $(PERL) $< | $(CC) -E - | tee $@ > /dev/null
+       (preproc=/tmp/$$$$.$@; trap "rm $$preproc" INT; \
+       $(PERL) asm/sha1-alpha.pl > $$preproc && \
+       $(CC) -E $$preproc > $@ && rm $$preproc)
 
 # Solaris make has to be explicitly told
 sha1-x86_64.s: asm/sha1-x86_64.pl;     $(PERL) asm/sha1-x86_64.pl $(PERLASM_SCHEME) > $@

diff --git a/util/shlib_wrap.sh b/util/shlib_wrap.sh
index 9416d593d2b8d48fcb4579f6718826b8813501bd..8775cb5411e1f2397eb0e138203b2c9636411f50 100755 (executable)
--- a/util/shlib_wrap.sh
+++ b/util/shlib_wrap.sh
@@ -90,4 +90,8 @@ fi
 
 cmd="$1${EXE_EXT}"
 shift
-exec "$cmd" "$@"
+if [ $# -eq 0 ]; then
+       exec "$cmd"     # old sh, such as Tru64 4.x, fails to expand empty "$@"
+else
+       exec "$cmd" "$@"
+fi