summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorjlam <jlam>2002-12-26 20:52:09 +0000
committerjlam <jlam>2002-12-26 20:52:09 +0000
commit034a4f45582ab67c7cb8ba69012e4fd4f201689f (patch)
tree7f8b05adbe7dad580a64b85ce74353da1a780d64 /misc
parenta339a98f164cc4cecd433138755fe932db9293ab (diff)
downloadpkgsrc-034a4f45582ab67c7cb8ba69012e4fd4f201689f.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 'misc')
-rw-r--r--misc/openoffice/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/misc/openoffice/Makefile b/misc/openoffice/Makefile
index ae9d40d7eb1..cd0d705c3fa 100644
--- a/misc/openoffice/Makefile
+++ b/misc/openoffice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2002/12/24 20:19:21 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2002/12/26 20:52:11 jlam Exp $
DISTNAME= openoffice-0.0.0.641
PKGREVISION= 1
@@ -109,5 +109,5 @@ do-install:
.include "../../devel/pth/buildlink2.mk"
.include "../../lang/perl5/buildlink2.mk"
-.include "../../mk/java.mk"
+.include "../../mk/java-vm.mk"
.include "../../mk/bsd.pkg.mk"