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 /lang | |
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 'lang')
-rw-r--r-- | lang/jasmin/Makefile | 4 | ||||
-rw-r--r-- | lang/jini/Makefile | 4 | ||||
-rw-r--r-- | lang/joos/Makefile | 4 | ||||
-rw-r--r-- | lang/nhc98/Makefile | 5 |
4 files changed, 8 insertions, 9 deletions
diff --git a/lang/jasmin/Makefile b/lang/jasmin/Makefile index 7b7cf1d821a..e87af036020 100644 --- a/lang/jasmin/Makefile +++ b/lang/jasmin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2002/10/18 21:12:11 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2002/12/26 20:52:10 jlam Exp $ # DISTNAME= jasmin-1.06 @@ -28,5 +28,5 @@ do-install: cd ${WRKSRC} && ${PAX} -rw . ${PREFIX}/jasmin ${LN} -s ${PREFIX}/jasmin/bin/jasmin ${PREFIX}/bin/jasmin -.include "../../mk/java.mk" +.include "../../mk/java-vm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/jini/Makefile b/lang/jini/Makefile index bf7ecf77326..3922e28c6bb 100644 --- a/lang/jini/Makefile +++ b/lang/jini/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2002/10/15 02:23:18 jschauma Exp $ +# $NetBSD: Makefile,v 1.10 2002/12/26 20:52:11 jlam Exp $ # DISTNAME= jini-${SUN_VERSION}-src @@ -58,5 +58,5 @@ do-install: cleandir: clean ${RM} -fr ${JINI_HOME} -.include "../../mk/java.mk" +.include "../../mk/java-vm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/joos/Makefile b/lang/joos/Makefile index f9763c89004..be3b648f973 100644 --- a/lang/joos/Makefile +++ b/lang/joos/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2002/10/15 02:22:32 jschauma Exp $ +# $NetBSD: Makefile,v 1.5 2002/12/26 20:52:11 jlam Exp $ # DISTNAME= joos-0.2 @@ -17,5 +17,5 @@ do-install: cd ${WRKSRC} && ${PAX} -s ,^./.*orig,, -rw . ${PREFIX}/joos cd ${PREFIX}/joos/Bin && ${LN} -s joos.a- joos -.include "../../mk/java.mk" +.include "../../mk/java-vm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/nhc98/Makefile b/lang/nhc98/Makefile index 11e76900999..a066e6e6ccb 100644 --- a/lang/nhc98/Makefile +++ b/lang/nhc98/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2002/11/14 22:38:30 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2002/12/26 20:52:11 jlam Exp $ DISTNAME= nhc98src-1.14a PKGNAME= nhc98-1.14a @@ -35,6 +35,5 @@ post-extract: @${FIND} ${WRKSRC}/docs -type d -name \*CVS\* | ${XARGS} ${RM} -rf .include "../../devel/ncurses/buildlink2.mk" -.include "../../mk/java.mk" +.include "../../mk/java-vm.mk" .include "../../mk/bsd.pkg.mk" - |