pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Fix DESTDIR.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/03e2cb8036b1
branches:  trunk
changeset: 540798:03e2cb8036b1
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Apr 07 17:39:50 2008 +0000

description:
Fix DESTDIR.

diffstat:

 games/mirrormagic/Makefile |  9 ++++-----
 misc/mirmon/Makefile       |  8 ++++----
 2 files changed, 8 insertions(+), 9 deletions(-)

diffs (57 lines):

diff -r 67320130907e -r 03e2cb8036b1 games/mirrormagic/Makefile
--- a/games/mirrormagic/Makefile        Mon Apr 07 17:37:36 2008 +0000
+++ b/games/mirrormagic/Makefile        Mon Apr 07 17:39:50 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2008/03/04 06:59:05 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2008/04/07 17:40:51 joerg Exp $
 #
 
 DISTNAME=              mirrormagic-2.0.2
@@ -31,13 +31,12 @@
 
 SPECIAL_PERMS=         bin/mirrormagic ${SETGID_GAMES_PERMS}
 
-INSTALLATION_DIRS=     bin
+INSTALLATION_DIRS=     bin share/mirrormagic
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/mirrormagic ${PREFIX}/bin
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/mirrormagic
+       ${INSTALL_PROGRAM} ${WRKSRC}/mirrormagic ${DESTDIR}${PREFIX}/bin
        cd ${WRKSRC} && ${PAX} -rw graphics levels music sounds \
-               ${PREFIX}/share/mirrormagic/
+               ${DESTDIR}${PREFIX}/share/mirrormagic/
 
        ${RM} -f ${WRKDIR}/PLIST
 .for levdir in Classic_Games
diff -r 67320130907e -r 03e2cb8036b1 misc/mirmon/Makefile
--- a/misc/mirmon/Makefile      Mon Apr 07 17:37:36 2008 +0000
+++ b/misc/mirmon/Makefile      Mon Apr 07 17:39:50 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/03/04 19:21:11 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2008/04/07 17:39:50 joerg Exp $
 #
 
 DISTNAME=              mirmon-1.36
@@ -30,6 +30,9 @@
 SUBST_FILES.mirmon2=   ${WRKDIR}/mirmon.conf
 SUBST_SED.mirmon2+=    -e s!@@MIRMONDIR@@!${MIRMONDIR}!g
 
+INSTALLATION_DIRS=     bin ${PKGMANDIR} share/examples/mirmon \
+                       share/mirmon/icons
+
 post-extract:
        ${CP} ${FILESDIR}/mirmon.conf ${WRKDIR}
 
@@ -39,11 +42,8 @@
 do-install:
        ${INSTALL_SCRIPT} ${WRKSRC}/mirmon ${DESTDIR}${PREFIX}/bin
        ${INSTALL_MAN} ${WRKDIR}/mirmon.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-       ${INSTALL_DATA_DIR} ${DESTDIR}${EG_DIR}
        ${INSTALL_DATA} ${WRKDIR}/mirmon.conf ${DESTDIR}${EG_DIR}
-       ${INSTALL_DATA_DIR} ${DESTDIR}${MIRMONDIR}
        ${INSTALL_DATA} ${WRKSRC}/countries.list ${DESTDIR}${MIRMONDIR}
-       ${INSTALL_DATA_DIR} ${DESTDIR}${MIRMONDIR}/icons
        cd ${WRKSRC}/icons && ${INSTALL_DATA} * ${DESTDIR}${MIRMONDIR}/icons
 
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index