[pkgsrc/trunk]: pkgsrc Fix DESTDIR.

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e6d4fc5c766e
branches:  trunk
changeset: 543408:e6d4fc5c766e
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Jun 16 15:14:26 2008 +0000

description:
Fix DESTDIR.

diffstat:

 net/walker/Makefile       |   6 +++---
 pkgtools/autoswc/Makefile |  15 +++++++--------
 2 files changed, 10 insertions(+), 11 deletions(-)

diffs (54 lines):

diff -r 41907db088cc -r e6d4fc5c766e net/walker/Makefile
--- a/net/walker/Makefile       Mon Jun 16 15:10:48 2008 +0000
+++ b/net/walker/Makefile       Mon Jun 16 15:14:26 2008 +0000
@@ -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_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 -r 41907db088cc -r e6d4fc5c766e pkgtools/autoswc/Makefile
--- a/pkgtools/autoswc/Makefile Mon Jun 16 15:10:48 2008 +0000
+++ b/pkgtools/autoswc/Makefile Mon Jun 16 15:14:26 2008 +0000
@@ -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|@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_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"