Add appropriate definitions of LDD so check-shlibs works correctly.

3 files changed, 13 insertions, 8 deletions

diff --git a/emulators/linux-locale/Makefile b/emulators/linux-locale/Makefile
index f181d08c2a1..e25b27938ba 100644
--- a/emulators/linux-locale/Makefile
+++ b/emulators/linux-locale/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/05/12 05:19:09 sakamoto Exp $
+# $NetBSD: Makefile,v 1.8 2000/08/25 00:20:22 jlam Exp $
 #
 
 DISTNAME=	locales-2.1-1mdk
@@ -41,6 +41,7 @@ EMULDIR=	${PREFIX}/${EMULSUBDIR}
 PLIST_SRC=	${WRKDIR}/PLIST_DYNAMIC
 EXCLUDELIST=	${WRKDIR}/EXCLUDE
 CPIOLIST=	${WRKDIR}/CPIOLIST
+LDD?=		${EMULDIR}/usr/bin/ldd
 
 do-install:
 	@${RM} -f ${CPIOLIST}
diff --git a/emulators/suse_base/Makefile b/emulators/suse_base/Makefile
index 9faeee4d2ae..07b8e30b33d 100644
--- a/emulators/suse_base/Makefile
+++ b/emulators/suse_base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2000/01/09 07:10:37 tls Exp $
+# $NetBSD: Makefile,v 1.12 2000/08/25 00:20:22 jlam Exp $
 
 DISTNAME=		suse_base-6.3
 CATEGORIES=		emulators
@@ -27,7 +27,7 @@ RPMFILES=		aaa_dir.rpm shlibs.rpm ldso.rpm libz.rpm \
 			bash.rpm gppshare.rpm ncurses-p1.rpm
 RPMIGNOREPATH=		tmp usr/tmp var
 
-LDD=			${PREFIX}/${EMULSUBDIR}/usr/bin/ldd
+LINUX_LDD=		${PREFIX}/${EMULSUBDIR}/usr/bin/ldd
 RPMLIB=			${LOCALBASE}/lib/librpm.a
 
 do-build:
@@ -54,10 +54,11 @@ do-install:
 	${EMULDIR}/sbin/ldconfig -r ${EMULDIR}
 	${ECHO} "@exec %D/${EMULSUBDIR}/sbin/ldconfig -r %D/${EMULSUBDIR}" \
 	  >>${PLIST_SRC}
-	${SED} -e 's:#! :#! /${EMULSUBDIR}:' \
-	       -e 's:^RTLD=:RTLD=/${EMULSUBDIR}:' <${LDD} >${LDD}.new
-	${MV} ${LDD}.new ${LDD}
-	${CHMOD} +x ${LDD}
+	${SED}	-e 's:#! :#! /${EMULSUBDIR}:' \
+		-e 's:^RTLD=:RTLD=/${EMULSUBDIR}:' \
+		< ${LINUX_LDD} > ${LINUX_LDD}.new
+	${MV} ${LINUX_LDD}.new ${LINUX_LDD}
+	${CHMOD} +x ${LINUX_LDD}
 	@${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${INSTALL_FILE} - POST-INSTALL
 
 .include "../suse_linux/suse.mk"
diff --git a/emulators/suse_linux/suse.mk b/emulators/suse_linux/suse.mk
index 5d11d7ddd7e..2da7da203a2 100644
--- a/emulators/suse_linux/suse.mk
+++ b/emulators/suse_linux/suse.mk
@@ -1,4 +1,4 @@
-# $NetBSD: suse.mk,v 1.5 2000/08/10 08:33:00 tron Exp $
+# $NetBSD: suse.mk,v 1.6 2000/08/25 00:20:22 jlam Exp $
 
 MASTER_SITE_SUSE=	ftp://ftp.suse.com/pub/suse/i386/6.3/suse/
 
@@ -12,6 +12,9 @@ EMULDIR=		${PREFIX}/${EMULSUBDIR}
 
 RPM2PKG=		${PREFIX}/sbin/rpm2pkg
 
+# The SuSE Linux packages have circular dependencies.
+LDD?=			${TRUE}	
+
 RPM2PKGARGS=		-d ${PREFIX} -f ${PLIST_SRC} -p ${EMULSUBDIR}
 .for TEMP in ${RPMIGNOREPATH}
 RPM2PKGARGS+=		-i ${TEMP}