diff options
| author | joerg <joerg@pkgsrc.org> | 2008-06-16 15:14:26 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2008-06-16 15:14:26 +0000 |
| commit | c7ed9a9347db793a4ceb83d0a7c7c8c1e652cbf4 (patch) | |
| tree | c9d6bd255512b4bf2193c0ee827346db4d60b60d | |
| parent | d092c3def3dc55a00361bbba611f3f8395f44d1d (diff) | |
| download | pkgsrc-c7ed9a9347db793a4ceb83d0a7c7c8c1e652cbf4.tar.gz | |
Fix DESTDIR.
| -rw-r--r-- | net/walker/Makefile | 6 | ||||
| -rw-r--r-- | pkgtools/autoswc/Makefile | 15 |
2 files changed, 10 insertions, 11 deletions
diff --git a/net/walker/Makefile b/net/walker/Makefile index 76ba0de7195..7102adb2633 100644 --- a/net/walker/Makefile +++ b/net/walker/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2008/04/21 21:40:25 reed Exp $ +# $NetBSD: Makefile,v 1.2 2008/06/16 15:14:26 joerg Exp $ # DISTNAME= walker-3.8 @@ -20,7 +20,7 @@ USE_LANGUAGES= # none USE_TOOLS+= perl:run do-install: - ${INSTALL} ${WRKSRC}/walker ${PREFIX}/bin/ - ${INSTALL_MAN} ${WRKSRC}/walker.1 ${PREFIX}/${PKGMANDIR}/man1/ + ${INSTALL} ${WRKSRC}/walker ${DESTDIR}${PREFIX}/bin/ + ${INSTALL_MAN} ${WRKSRC}/walker.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/ .include "../../mk/bsd.pkg.mk" diff --git a/pkgtools/autoswc/Makefile b/pkgtools/autoswc/Makefile index 895956a20a7..0974266c5b7 100644 --- a/pkgtools/autoswc/Makefile +++ b/pkgtools/autoswc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2008/06/12 02:14:42 joerg Exp $ +# $NetBSD: Makefile,v 1.15 2008/06/16 15:23:05 joerg Exp $ DISTNAME= autoswc-1.5 CATEGORIES= pkgtools sysutils @@ -50,7 +50,7 @@ SUBST_SED.build+= -e 's|@PREFIX@|${PREFIX}|g' SUBST_SED.build+= -e 's|@SH@|${SH}|g' SUBST_SED.build+= -e 's|@SYSCONFDIR@|${PKG_SYSCONFDIR}|g' -INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin +INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin share/autoswc do-extract: ${CP} ${FILESDIR}/autoswc.8 ${WRKSRC} @@ -62,11 +62,10 @@ do-build: @${DO_NADA} do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/autoswc ${PREFIX}/sbin - ${INSTALL_DATA} ${WRKSRC}/autoswc.8 ${PREFIX}/${PKGMANDIR}/man8 - ${INSTALL_DATA_DIR} ${PREFIX}/share/autoswc - ${INSTALL_DATA} ${WRKSRC}/autoswc.mk ${PREFIX}/share/autoswc - ${INSTALL_DATA} ${WRKSRC}/config.site ${PREFIX}/share/autoswc - ${INSTALL_DATA} ${FILESDIR}/configure.ac ${PREFIX}/share/autoswc + ${INSTALL_SCRIPT} ${WRKSRC}/autoswc ${DESTDIR}${PREFIX}/sbin + ${INSTALL_DATA} ${WRKSRC}/autoswc.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 + ${INSTALL_DATA} ${WRKSRC}/autoswc.mk ${DESTDIR}${PREFIX}/share/autoswc + ${INSTALL_DATA} ${WRKSRC}/config.site ${DESTDIR}${PREFIX}/share/autoswc + ${INSTALL_DATA} ${FILESDIR}/configure.ac ${DESTDIR}${PREFIX}/share/autoswc .include "../../mk/bsd.pkg.mk" |