diff options
| author | jwise <jwise> | 2000-01-15 02:08:03 +0000 |
|---|---|---|
| committer | jwise <jwise> | 2000-01-15 02:08:03 +0000 |
| commit | f5bb8fa6281a34e8397d81fd3be80a7f0eb3df15 (patch) | |
| tree | 25003dedf135d83e97e0bb7748849c1ca32ced70 /mk | |
| parent | ccf7adc1e9887b6190adedbe90fb86da5454a66c (diff) | |
| download | pkgsrc-f5bb8fa6281a34e8397d81fd3be80a7f0eb3df15.tar.gz | |
Two nits with the show-shlib-type target:
1.) protect definition of show-shlib-type with `if !target(show-shlib-type)'
so that it can be overriden in a pkg makefile
2.) move the definition in lang/jdk/Makefile before the include of bsd.pkg.mk
to trigger this.
Without these changes, show-shlib-type was `ELF\na.out' on i386/ELF, so
it was still treated as ELF.
lang/jdk now works on i386/ELF (yay!).
While there, fix JAVA_HOME default to be JDK_HOME if PKG_JVM is jdk
and JDK_HOME is defined.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index fd03e3d14e6..170f4f881f1 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.393 2000/01/14 11:58:21 agc Exp $ +# $NetBSD: bsd.pkg.mk,v 1.394 2000/01/15 02:08:03 jwise Exp $ # # This file is in the public domain. # @@ -87,7 +87,11 @@ PKG_JVM?= kaffe .endif .if ${PKG_JVM} == "jdk" DEPENDS+= jdk-1.1.*:${PKGSRCDIR}/lang/jdk +.if defined(JDK_HOME) +JAVA_HOME?= ${JDK_HOME} +.else JAVA_HOME?= ${LOCALBASE}/java +.endif .elif ${PKG_JVM} == "kaffe" DEPENDS+= kaffe-[0-9]*:${PKGSRCDIR}/lang/kaffe JAVA_HOME?= ${LOCALBASE}/kaffe @@ -1520,7 +1524,7 @@ root-install: .endif # !NO_PKG_REGISTER ${_PKG_SILENT}${_PKG_DEBUG}${TOUCH} ${TOUCH_FLAGS} ${WRKDIR}/.install_done - +.if !target(show-shlib-type) # Show the shared lib type being built: one of ELF, a.out or none show-shlib-type: ${_PKG_SILENT}${_PKG_DEBUG} \ @@ -1538,6 +1542,7 @@ show-shlib-type: fi; \ ${ECHO} "$$sotype"; \ ${RM} -f a.$$$$.c a.$$$$.out +.endif ################################################################ |