diff options
| author | jlam <jlam@pkgsrc.org> | 2002-12-26 20:52:09 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-12-26 20:52:09 +0000 |
| commit | a0712b80ae45f063c72c9818c54eba04994471b3 (patch) | |
| tree | 7f8b05adbe7dad580a64b85ce74353da1a780d64 /devel | |
| parent | 53ea1d6963597f6192688ff92819483e4e56a467 (diff) | |
| download | pkgsrc-a0712b80ae45f063c72c9818c54eba04994471b3.tar.gz | |
Move java.mk to java-vm.mk to avoid name conflict with devel/mk-files as
suggested by Simon J. Gerraty.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/jakarta-ant/Makefile | 4 | ||||
| -rw-r--r-- | devel/javadeps/Makefile | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/devel/jakarta-ant/Makefile b/devel/jakarta-ant/Makefile index c22fc36cb31..ddf537ea547 100644 --- a/devel/jakarta-ant/Makefile +++ b/devel/jakarta-ant/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2002/10/18 21:05:28 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2002/12/26 20:52:10 jlam Exp $ # # NOTE: if you are depending on ant from another package, please be aware that # the ant team has CHANGED the version numbering scheme. A previous version @@ -42,7 +42,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/java/ant ${INSTALL_DATA} ${WRKSRC}/WHATSNEW ${PREFIX}/share/doc/java/ant -.include "../../mk/java.mk" +.include "../../mk/java-vm.mk" .include "../../mk/bsd.pkg.mk" CLASSPATH:= ${CLASSPATH}:${LOCALBASE}/lib/java/crimson.jar diff --git a/devel/javadeps/Makefile b/devel/javadeps/Makefile index b05987d5a32..00783900883 100644 --- a/devel/javadeps/Makefile +++ b/devel/javadeps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/10/18 21:10:02 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2002/12/26 20:52:10 jlam Exp $ # DISTNAME= javadeps-1.1 @@ -31,5 +31,5 @@ do-install: cd ${WRKSRC}/doc; ${PAX} -rwpe . ${PREFIX}/share/doc/jdeps ${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/share/jdeps ${PREFIX}/share/doc/jdeps -.include "../../mk/java.mk" +.include "../../mk/java-vm.mk" .include "../../mk/bsd.pkg.mk" |