Enable PKG_DESTDIR_SUPPORT for suse100_*

4 files changed, 17 insertions, 14 deletions

diff --git a/emulators/suse100_base/Makefile b/emulators/suse100_base/Makefile
index 47e3644256a..26ee84e0df4 100644
--- a/emulators/suse100_base/Makefile
+++ b/emulators/suse100_base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2007/07/30 22:01:11 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2009/06/05 11:20:27 abs Exp $
 
 DISTNAME=	suse_base-${SUSE_VERSION}
 PKGREVISION=	5
@@ -24,7 +24,7 @@ RPMIGNOREPATH=		./etc/bash.bashrc ./etc/bash_completion.d \
 LINUX_LDD=		${EMULDIR}/usr/bin/ldd
 LINUX_LDCONFIG=		${EMULDIR}/usr/sbin/ldconfig
 
-INSTALLATION_DIRS=	sbin
+INSTALLATION_DIRS+=	sbin emul/linux/etc
 OWN_DIRS+=		${EMULSUBDIR}
 
 SUBST_CLASSES+=		suse
@@ -35,7 +35,7 @@ SUBST_VARS.suse=	EMULDIR LINUX_BASE SUSE_ARCH SUSE_VERSION
 # Some platforms, e.g. FreeBSD, need to "brand" the ELF binaries to
 # the correct type.
 #
-BRANDELF_CMD=	${BRANDELF:D${BRANDELF} -t Linux ${LINUX_LDCONFIG}:U${TRUE}}
+BRANDELF_CMD=	${BRANDELF:D${BRANDELF} -t Linux ${DESTDIR}${LINUX_LDCONFIG}:U${TRUE}}
 
 post-extract:
 	${CP} ${FILESDIR}/SuSE-release ${WRKSRC}
@@ -43,14 +43,14 @@ post-extract:
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/linux-mkpwd.sh \
-		${PREFIX}/sbin/${LINUX_BASE}-mkpwd
-	${INSTALL_DATA} ${WRKSRC}/SuSE-release ${EMULDIR}/etc
+		${DESTDIR}${PREFIX}/sbin/${LINUX_BASE}-mkpwd
+	${INSTALL_DATA} ${WRKSRC}/SuSE-release ${DESTDIR}${EMULDIR}/etc
 	${BRANDELF_CMD}
 	${SED}	-e 's:#! :#! ${EMULDIR}:' \
 		-e 's:^RTLD=:RTLD=/${EMULSUBDIR}:' \
-		${LINUX_LDD} > ${LINUX_LDD}.new
-	${MV} ${LINUX_LDD}.new ${LINUX_LDD}
-	${CHMOD} +x ${LINUX_LDD}
+		${DESTDIR}${LINUX_LDD} > ${DESTDIR}${LINUX_LDD}.new
+	${MV} ${DESTDIR}${LINUX_LDD}.new ${DESTDIR}${LINUX_LDD}
+	${CHMOD} +x ${DESTDIR}${LINUX_LDD}
 
 .include "../../emulators/suse100_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_fontconfig/Makefile b/emulators/suse100_fontconfig/Makefile
index 6d2e0b19c46..453ab10d92f 100644
--- a/emulators/suse100_fontconfig/Makefile
+++ b/emulators/suse100_fontconfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2008/11/23 17:24:55 jmcneill Exp $
+# $NetBSD: Makefile,v 1.10 2009/06/05 11:20:27 abs Exp $
 
 DISTNAME=	suse_fontconfig-${SUSE_VERSION}
 PKGREVISION=	6
@@ -21,6 +21,6 @@ do-build:
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/local.conf				\
-		${PREFIX}/${EMULSUBDIR}/etc/fonts/local.conf
+		${DESTDIR}${PREFIX}/${EMULSUBDIR}/etc/fonts/local.conf
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_linux/Makefile.common b/emulators/suse100_linux/Makefile.common
index 23fdaa23bf8..da88fe8e0ae 100644
--- a/emulators/suse100_linux/Makefile.common
+++ b/emulators/suse100_linux/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2008/09/04 11:53:48 obache Exp $
+# $NetBSD: Makefile.common,v 1.21 2009/06/05 11:20:27 abs Exp $
 
 SUSE_PKG=		yes
 SUSE_VERSION=		10.0
@@ -19,6 +19,8 @@ ONLY_FOR_PLATFORM+=	NetBSD-3.99*-x86_64
 ONLY_FOR_PLATFORM+=	NetBSD-[4-9]*-x86_64
 .endif
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../mk/bsd.prefs.mk"
 
 # _SUSE_ARCH.* is a table of ${EMUL_ARCH} to SuSE architectures.
@@ -81,7 +83,7 @@ BUILD_DIRS?=		# empty
 MANCOMPRESSED?=		yes
 
 EMUL_PKG_FMT?=		rpm
-RPM2PKG_PREFIX?=	${PREFIX}
+RPM2PKG_PREFIX?=	${DESTDIR}${PREFIX}
 RPM2PKG_SUBPREFIX?=	${EMULSUBDIR}
 RPM2PKG_STAGE?=		do-install
 
diff --git a/emulators/suse100_slang/Makefile b/emulators/suse100_slang/Makefile
index c0311a3a591..08975a6ab1a 100644
--- a/emulators/suse100_slang/Makefile
+++ b/emulators/suse100_slang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/07/29 05:18:58 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2009/06/05 11:20:27 abs Exp $
 
 DISTNAME=	suse_slang-${SUSE_VERSION}
 PKGREVISION=	3
@@ -14,7 +14,8 @@ EMUL_MODULES.linux=	base
 CHECK_FILES_SKIP+=	${EMULDIR}/usr/${LINUX_LIBSUBDIR}/libslang.so.1
 
 post-install:
-	cd ${EMULDIR}/usr/lib && ${LN} -fs libslang-utf8.so.1 libslang.so.1
+	cd ${DESTDIR}${EMULDIR}/usr/lib && \
+		${LN} -fs libslang-utf8.so.1 libslang.so.1
 
 .include "../../emulators/suse100_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"