diff options
| author | joerg <joerg@pkgsrc.org> | 2008-04-07 17:25:56 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2008-04-07 17:25:56 +0000 |
| commit | 53953584f4fb59fc16c3474a50eb865bcdc7ebfd (patch) | |
| tree | 68dd9dbeb6caef92ca3605d97ad547d0e67d80b4 /devel | |
| parent | 7abed6cdf71898da6ce62eb9733b7302408f6c06 (diff) | |
| download | pkgsrc-53953584f4fb59fc16c3474a50eb865bcdc7ebfd.tar.gz | |
Fix DESTDIR.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/javacc/Makefile | 5 | ||||
| -rw-r--r-- | devel/javadeps/Makefile | 8 |
2 files changed, 5 insertions, 8 deletions
diff --git a/devel/javacc/Makefile b/devel/javacc/Makefile index 7a05914e6cf..30cb09d30ec 100644 --- a/devel/javacc/Makefile +++ b/devel/javacc/Makefile @@ -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 @@ SUBST_SED.paths= -e 's,`dirname \$$0`/lib,${PREFIX}/lib/java,g' .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 @@ do-install: ${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 --git a/devel/javadeps/Makefile b/devel/javadeps/Makefile index 571aca39f32..73a30e156fe 100644 --- a/devel/javadeps/Makefile +++ b/devel/javadeps/Makefile @@ -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 @@ PKG_DESTDIR_SUPPORT= destdir 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-build: 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" |