diff options
| -rw-r--r-- | www/opera/Makefile | 4 | ||||
| -rw-r--r-- | www/opera/Makefile.rpm | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/www/opera/Makefile b/www/opera/Makefile index 26240a801c9..5f56ef55e7f 100644 --- a/www/opera/Makefile +++ b/www/opera/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.88 2009/05/19 08:59:37 wiz Exp $ +# $NetBSD: Makefile,v 1.89 2009/08/29 13:15:54 obache Exp $ DISTNAME= opera-${OPERA_PKG_VERSION:S/u/pl/} CATEGORIES= www @@ -19,7 +19,7 @@ EMUL_PLATFORMS= freebsd-i386 EMUL_PLATFORMS+= linux-i386 EMUL_PLATFORMS+= solaris-sparc -#PKG_DESTDIR_SUPPORT= user-destdir +PKG_DESTDIR_SUPPORT= user-destdir .include "../../mk/bsd.prefs.mk" diff --git a/www/opera/Makefile.rpm b/www/opera/Makefile.rpm index 906d6d56a2e..1149d280e37 100644 --- a/www/opera/Makefile.rpm +++ b/www/opera/Makefile.rpm @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.rpm,v 1.5 2009/02/22 11:54:23 ahoka Exp $ +# $NetBSD: Makefile.rpm,v 1.6 2009/08/29 13:15:54 obache Exp $ # This package installs from an RPM directly into "/usr" on a Linux # system, which can't be managed by pkgsrc. @@ -17,7 +17,7 @@ WRKSRC= ${WRKDIR} BUILD_DIRS= # empty EMUL_PKG_FMT= rpm -RPM2PKG_PREFIX= ${PREFIX} +RPM2PKG_PREFIX= ${DESTDIR}${PREFIX} RPM2PKG_SUBPREFIX= ${EMULSUBDIR} RPM2PKG_STAGE= do-install @@ -30,10 +30,10 @@ post-extract: ${CP} ${FILESDIR}/opera.sh ${WRKSRC} post-install: - ${INSTALL_SCRIPT} ${WRKDIR}/opera.sh ${PREFIX}/bin/opera + ${INSTALL_SCRIPT} ${WRKDIR}/opera.sh ${DESTDIR}${PREFIX}/bin/opera ${LN} -fs ${EMULDIR}/usr/share/man/man1/opera.1 \ - ${PREFIX}/${PKGMANDIR}/man1 + ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 ${ECHO} "bin/opera" >> ${RPM2PKG_PLIST} ${ECHO} "${PKGMANDIR}/man1/opera.1" >> ${RPM2PKG_PLIST} ${ECHO} "${PREFIX}/lib/netscape/plugins=1" >> \ - ${PREFIX}/${EMULSUBDIR}/usr/share/opera/ini/pluginpath.ini + ${DESTDIR}${PREFIX}/${EMULSUBDIR}/usr/share/opera/ini/pluginpath.ini |