[pkgsrc/trunk]: pkgsrc Fix DESTDIR installation

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/402e01b3bf86
branches:  trunk
changeset: 396791:402e01b3bf86
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Aug 03 15:18:03 2009 +0000

description:
Fix DESTDIR installation

diffstat:

 databases/p5-AddressBook/Makefile |   7 +++----
 www/p5-Apache-Gallery/Makefile    |  28 ++++++++++++----------------
 2 files changed, 15 insertions(+), 20 deletions(-)

diffs (67 lines):

diff -r 1a54c6d2866c -r 402e01b3bf86 databases/p5-AddressBook/Makefile
--- a/databases/p5-AddressBook/Makefile Mon Aug 03 14:54:00 2009 +0000
+++ b/databases/p5-AddressBook/Makefile Mon Aug 03 15:18:03 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2009/07/07 15:46:47 sno Exp $
+# $NetBSD: Makefile,v 1.18 2009/08/03 15:18:35 joerg Exp $
 
 DISTNAME=      AddressBook-0.16
 PKGNAME=       p5-${DISTNAME}
@@ -26,12 +26,11 @@
 REPLACE_PERL+= examples/phonelist.cgi
 
 EGDIR=         ${PREFIX}/share/examples/${PKGBASE}
+INSTALLATION_DIRS=     ${EGDIR}
 
 post-install:
-       ${INSTALL_DATA_DIR} ${EGDIR}
-       cd ${WRKSRC};                                                   \
        for file in ${REPLACE_PERL} examples/ldap-abook.conf; do        \
-               ${INSTALL_DATA} $${file} ${EGDIR};                      \
+               ${INSTALL_DATA} ${WRKSRC}/$${file} ${DESTDIR}${EGDIR};  \
        done
 
 .include "../../lang/perl5/module.mk"
diff -r 1a54c6d2866c -r 402e01b3bf86 www/p5-Apache-Gallery/Makefile
--- a/www/p5-Apache-Gallery/Makefile    Mon Aug 03 14:54:00 2009 +0000
+++ b/www/p5-Apache-Gallery/Makefile    Mon Aug 03 15:18:03 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2009/07/07 16:27:33 sno Exp $
+# $NetBSD: Makefile,v 1.40 2009/08/03 15:18:03 joerg Exp $
 #
 
 DISTNAME=      Apache-Gallery-0.9.1
@@ -88,22 +88,18 @@
            done; \
        done
 
+INSTALLATION_DIRS=     ${AG_SHAREDIR}/htdocs ${AG_SHAREDIR}/templates \
+                       ${AG_DOCDIR} ${AG_EGDIR}
+
 post-install:
-       ${INSTALL_DATA_DIR} ${AG_SHAREDIR}
-       @set +x; \
-       for i in htdocs templates; \
-       do \
-           ${INSTALL_DATA_DIR} ${AG_SHAREDIR}/$$i; \
-           cd ${WRKSRC}/$$i && pax -rw . ${AG_SHAREDIR}/$$i; \
-       done; \
-       ${INSTALL_DATA_DIR} ${AG_DOCDIR}; \
-       for i in Changes INSTALL LICENSE README UPGRADE; \
-       do \
-           ${INSTALL_DATA} ${WRKSRC}/$$i ${AG_DOCDIR}; \
-       done
-       ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${AG_SHAREDIR}; \
-       ${INSTALL_DATA_DIR} ${AG_EGDIR}
-       ${INSTALL_DATA} ${WRKSRC}/${AG}.conf ${AG_EGDIR}
+       cd ${WRKSRC}/htdocs && pax -rw . ${DESTDIR}${AG_SHAREDIR}/htdocs
+       cd ${WRKSRC}/templates && pax -rw . ${DESTDIR}${AG_SHAREDIR}/templates
+       ${INSTALL_DATA} ${WRKSRC}/Changes ${DESTDIR}${AG_DOCDIR}
+       ${INSTALL_DATA} ${WRKSRC}/INSTALL ${DESTDIR}${AG_DOCDIR}
+       ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DESTDIR}${AG_DOCDIR}
+       ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${AG_DOCDIR}
+       ${INSTALL_DATA} ${WRKSRC}/UPGRADE ${DESTDIR}${AG_DOCDIR}
+       ${INSTALL_DATA} ${WRKSRC}/${AG}.conf ${DESTDIR}${AG_EGDIR}
 
 .include "../../graphics/imlib2/buildlink3.mk"
 .include "../../lang/perl5/module.mk"