[pkgsrc/trunk]: pkgsrc Fix DESTDIR.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/65a8f26aadc9
branches:  trunk
changeset: 540792:65a8f26aadc9
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Apr 07 17:25:56 2008 +0000

description:
Fix DESTDIR.

diffstat:

 devel/javacc/Makefile   |  5 ++---
 devel/javadeps/Makefile |  8 +++-----
 editors/jave/Makefile   |  9 +++++----
 3 files changed, 10 insertions(+), 12 deletions(-)

diffs (88 lines):

diff -r 21286d96e406 -r 65a8f26aadc9 devel/javacc/Makefile
--- a/devel/javacc/Makefile     Mon Apr 07 17:23:40 2008 +0000
+++ b/devel/javacc/Makefile     Mon Apr 07 17:25:56 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/03/03 17:45:35 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2008/04/07 17:25:56 joerg Exp $
 
 DISTNAME=      javacc-4.0
 CATEGORIES=    devel
@@ -22,7 +22,7 @@
 
 .include "../../mk/java-vm.mk"
 
-INSTALLATION_DIRS+=    bin
+INSTALLATION_DIRS+=    bin share/examples/javacc
 
 do-install:
 .for f in javacc jjdoc jjtree
@@ -33,7 +33,6 @@
        ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/javacc
        ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DESTDIR}${PREFIX}/share/doc/javacc
        ${INSTALL_DATA} ${WRKSRC}/doc/* ${DESTDIR}${PREFIX}/share/doc/javacc
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/javacc
        ${CP} -R ${WRKSRC}/examples/* ${DESTDIR}${PREFIX}/share/examples/javacc
        ${FIND} ${DESTDIR}${PREFIX}/share/examples/javacc -type d -print \
                | ${XARGS} ${CHMOD} ${PKGDIRMODE}
diff -r 21286d96e406 -r 65a8f26aadc9 devel/javadeps/Makefile
--- a/devel/javadeps/Makefile   Mon Apr 07 17:23:40 2008 +0000
+++ b/devel/javadeps/Makefile   Mon Apr 07 17:25:56 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2008/03/03 17:45:35 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2008/04/07 17:26:42 joerg Exp $
 #
 
 DISTNAME=      javadeps-1.1
@@ -16,7 +16,7 @@
 WRKSRC=                ${WRKDIR}/JavaDeps-1.1
 USE_JAVA=      run
 
-INSTALLATION_DIRS=     bin
+INSTALLATION_DIRS=     bin share/doc/jdeps share/jdeps
 
 do-build:
        cd ${WRKSRC}; for file in jdeps; do                             \
@@ -28,12 +28,10 @@
 
 do-install:
        ${CP} ${WRKSRC}/jdeps ${DESTDIR}${PREFIX}/bin
-       ${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/share/jdeps
        ${CP} ${WRKSRC}/jdeps.jar ${DESTDIR}${PREFIX}/share/jdeps/jdeps.jar
-       ${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/share/doc/jdeps
        cd ${WRKSRC}/doc && ${PAX} -rw -pe . ${DESTDIR}${PREFIX}/share/doc/jdeps
        ${CHOWN} -R ${BINOWN}:${BINGRP} \
-               ${DESTDIR}${PREFIX}/share/jdeps ${PREFIX}/share/doc/jdeps
+               ${DESTDIR}${PREFIX}/share/jdeps ${DESTDIR}${PREFIX}/share/doc/jdeps
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 21286d96e406 -r 65a8f26aadc9 editors/jave/Makefile
--- a/editors/jave/Makefile     Mon Apr 07 17:23:40 2008 +0000
+++ b/editors/jave/Makefile     Mon Apr 07 17:25:56 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/03/03 18:25:52 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2008/04/07 17:27:31 joerg Exp $
 
 DISTNAME=              jave_6.0_M7
 PKGNAME=               jave-6.0m7
@@ -19,6 +19,8 @@
 
 WRKSRC=                        ${WRKDIR}
 
+INSTALLATION_DIRS=     bin sjare/jave
+
 post-extract:
        ${MKDIR} ${WRKDIR:Q}/.workdir
        ${MV} ${WRKDIR:Q}/* ${WRKDIR:Q}/.workdir/
@@ -29,9 +31,8 @@
                < ${FILESDIR:Q}/jave > ${WRKDIR:Q}/jave
 
 do-install:
-       ${INSTALL_SCRIPT} ${WRKDIR:Q}/jave ${DESTDIR}${PREFIX:Q}/bin
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX:Q}/share/jave
-       (cd ${WRKDIR:Q}/.workdir && ${PAX} -rw * ${DESTDIR}${PREFIX:Q}/share/jave)
+       ${INSTALL_SCRIPT} ${WRKDIR:Q}/jave ${DESTDIR}${PREFIX}/bin
+       (cd ${WRKDIR:Q}/.workdir && ${PAX} -rw * ${DESTDIR}${PREFIX}/share/jave)
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"