Make Makefiles OSF-make-friendly.

PR: 3165

diff --git a/crypto/Makefile b/crypto/Makefile
index 1de9d5f4b94f75b273113d178247a1c88508f985..b253f504a64bc5d10f6ce3343b8ded4abff168e0 100644 (file)
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -86,7 +86,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)
 
 subdirs:
        @target=all; $(RECURSIVE_MAKE)

diff --git a/crypto/bn/Makefile b/crypto/bn/Makefile
index 30cc210feb133c333b3d504ac35640e4964f1cde..5f2c2f4d13ac68deacf90a865464bfa8beb0a731 100644 (file)
--- a/crypto/bn/Makefile
+++ b/crypto/bn/Makefile
@@ -136,7 +136,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 98a7e8de5631d77073cd83572c1fb734575e99cd..c33d8a617ae2aaea942c2858dc31b2e6c4f07b1c 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 88ac65e4b136e9dcfb81e025020eddf549c847ff..ce0dcd6a9bfac8726566bdfb779e780c17110c89 100644 (file)
--- a/crypto/modes/Makefile
+++ b/crypto/modes/Makefile
@@ -55,7 +55,10 @@ aesni-gcm-x86_64.s:  asm/aesni-gcm-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 63fba69869f6b787c9199b48584566b22e9d5a25..64eab6c4a4663dcda93caba9f02a5755e92fb421 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