From a41b0aade202705fdf829433a8e19a33049f412c Mon Sep 17 00:00:00 2001
From: Andy Polyakov <appro@openssl.org>
Date: Thu, 23 Jun 2005 15:36:15 +0000
Subject: [PATCH] HP-UX specific updates to Makefile.org and Makefile.shared.

---
 Makefile.org    | 9 +++++----
 Makefile.shared | 2 ++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Makefile.org b/Makefile.org
index b78a82ec93..3dba4a1a28 100644
--- 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 019ebb2864..9e9b28e2c2 100644
--- 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 \
-- 
2.25.1