From 0d35ed5b13bbd9e9943c1d917c3347d7f809baaf Mon Sep 17 00:00:00 2001
From: skrll <skrll>
Date: Sun, 31 Dec 2000 12:21:07 +0000
Subject: Fix handling of SHLIB_HANDLING=NO. That is neither stage of do-shlib-
 handling should be performed.

This fixes the build problems for emulators/compat1[23].
---
 mk/bsd.pkg.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'mk')

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 3f4125183f2..31b38748b76 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.631 2000/12/30 11:19:04 hubertf Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.632 2000/12/31 12:21:07 skrll Exp $
 #
 # This file is in the public domain.
 #
@@ -1728,10 +1728,8 @@ real-su-install:
 		done;							\
 	fi
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS"
-.if ${SHLIB_HANDLING} == "YES"
 	${_PKG_SILENT}${_PKG_DEBUG}\
 	${MAKE} ${MAKEFLAGS} do-shlib-handling SHLIB_PLIST_MODE=0
-.endif # SHLIB_HANDLING == "YES"
 .endif # OPSYS == "NetBSD" || OPSYS == "SunOS"
 .ifdef MESSAGE_FILE
 	@${ECHO_MSG} "${_PKGSRC_IN}> Please note the following:"
@@ -1763,6 +1761,7 @@ real-su-install:
 #     real-su-install
 #
 do-shlib-handling:
+.if ${SHLIB_HANDLING} == "YES"
 	${_PKG_SILENT}${_PKG_DEBUG}					\
 	sos=`${EGREP} -h -x '.*/lib[^/]+\.so\.[0-9]+(\.[0-9]+)+' ${PLIST} || ${TRUE}`; \
 	if [ "$$sos" != "" ]; then					\
@@ -1862,6 +1861,7 @@ do-shlib-handling:
 			;;						\
 		esac;							\
 	fi
+.endif # SHLIB_HANDLING == "YES"
 
 
 # Check if all binaries and shlibs find their needed libs
-- 
cgit v1.2.3