diff options
| author | jlam <jlam> | 2002-12-26 20:52:09 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-12-26 20:52:09 +0000 |
| commit | 034a4f45582ab67c7cb8ba69012e4fd4f201689f (patch) | |
| tree | 7f8b05adbe7dad580a64b85ce74353da1a780d64 /mk | |
| parent | a339a98f164cc4cecd433138755fe932db9293ab (diff) | |
| download | pkgsrc-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 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 6 | ||||
| -rw-r--r-- | mk/java-vm.mk (renamed from mk/java.mk) | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 9d7478b9e54..6ad176ca964 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1115 2002/12/25 12:32:32 grant Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1116 2002/12/26 20:52:13 jlam Exp $ # # This file is in the public domain. # @@ -55,7 +55,7 @@ _DISTDIR?= ${DISTDIR}/${DIST_SUBDIR} INTERACTIVE_STAGE?= none -.if !defined(JAVA_MK) +.if !defined(JAVA_VM_MK) .if defined(USE_JAVA) BUILD_DEFS+= PKG_JVM . if !defined(PKG_JVM) @@ -136,7 +136,7 @@ SCRIPTS_ENV+= JAVA_HOME=${PKG_JAVA_HOME} PATH:= ${PKG_JAVA_HOME}/bin:${PATH} .endif -.endif ! JAVA_MK +.endif ! JAVA_VM_MK # Set the default BUILDLINK_DIR, BUILDLINK_X11PKG_DIR, BUILDLINK_X11_DIR so # that if no buildlink2.mk files are included, then they still point to diff --git a/mk/java.mk b/mk/java-vm.mk index 203ff37b950..f9ee33e9064 100644 --- a/mk/java.mk +++ b/mk/java-vm.mk @@ -1,8 +1,8 @@ -# $NetBSD: java.mk,v 1.8 2002/12/25 04:48:20 jlam Exp $ +# $NetBSD: java-vm.mk,v 1.1 2002/12/26 20:52:14 jlam Exp $ # # This Makefile fragment handles Java dependencies and make variables, # and is meant to be included by packages that require Java either at -# build-time or at run-time. java.mk will: +# build-time or at run-time. java-vm.mk will: # # * set PKG_JVM and PKG_JAVA_HOME to the name of the JVM used and # to the directory in which the JVM is installed, respectively; @@ -20,8 +20,8 @@ # PKG_JVMS_ACCEPTED is a package-settable list of JVMs that may be used as # possible dependencies for the package. -.if !defined(JAVA_MK) -JAVA_MK= # defined +.if !defined(JAVA_VM_MK) +JAVA_VM_MK= # defined .include "../../mk/bsd.prefs.mk" @@ -254,4 +254,4 @@ MAKE_ENV+= JAVA_HOME=${PKG_JAVA_HOME} CONFIGURE_ENV+= JAVA_HOME=${PKG_JAVA_HOME} SCRIPTS_ENV+= JAVA_HOME=${PKG_JAVA_HOME} -.endif # JAVA_MK +.endif # JAVA_VM_MK |