HP-UX specific updates to Makefile.org and Makefile.shared.

diff --git a/Makefile.org b/Makefile.org
index b78a82ec9309849dc0c90ba6dc95f7d2837b4981..3dba4a1a28313e5f8d0b4bb9da8483c5e17e3237 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -149,10 +149,11 @@ HEADER=         e_os.h
 all: Makefile build_all openssl.pc
 
 # as we stick to -e, CLEARENV ensures that local variables in lower
-# Makefiles remain local and variable. $${var+var} is tribute to Korn
-# shell, which [annoyingly enough] terminates unset with error if var
-# is not set:-(
-CLEARENV=      unset $${TOP+TOP} $${LIB+LIB} $${LIBS+LIBS}     \
+# Makefiles remain local and variable. $${VAR+VAR} is tribute to Korn
+# shell, which [annoyingly enough] terminates unset with error if VAR
+# is not present:-( TOP= && unset TOP is tribute to HP-UX /bin/sh,
+# which terminates unset with error if no variable was present:-(
+CLEARENV=      TOP= && unset TOP $${LIB+LIB} $${LIBS+LIBS}     \
                $${INCLUDE+INCLUDE} $${INCLUDES+INCLUDES}       \
                $${DIR+DIR} $${DIRS+DIRS} $${SRC+SRC}           \
                $${LIBSRC+LIBSRC} $${LIBOBJ+LIBOBJ} $${ALL+ALL} \

diff --git a/Makefile.shared b/Makefile.shared
index 019ebb286440c55562dc3476091971de52132862..9e9b28e2c20f34c58c4c3c9e7c74f0243c59a75d 100644 (file)
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -455,6 +455,7 @@ link_o.hpux:
        expr $(PLATFORM) : 'hpux64' > /dev/null && ALLSYMSFLAGS='-Wl,+forceload'; \
        SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-B,symbolic,+vnocompatwarnings,-z,+s,+h,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
        fi; \
+       rm -f $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX || :; \
        $(LINK_SO_O) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX
 link_a.hpux:
        @if ${DETECT_GNU_LD}; then $(DO_GNU_SO); else \
@@ -467,6 +468,7 @@ link_a.hpux:
        expr $(PLATFORM) : 'hpux64' > /dev/null && ALLSYMSFLAGS='-Wl,+forceload'; \
        SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-B,symbolic,+vnocompatwarnings,-z,+s,+h,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
        fi; \
+       rm -f $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX || :; \
        $(LINK_SO_A) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX
 link_app.hpux:
        @if ${DETECT_GNU_LD}; then $(DO_GNU_APP); else \