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 /lang | |
| 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 'lang')
| -rw-r--r-- | lang/jdk/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lang/jdk/Makefile b/lang/jdk/Makefile index fb97ccc9113..7523ea9e48a 100644 --- a/lang/jdk/Makefile +++ b/lang/jdk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2000/01/13 20:13:38 jwise Exp $ +# $NetBSD: Makefile,v 1.14 2000/01/15 02:08:04 jwise Exp $ # VERSION=1.1.8 @@ -34,10 +34,10 @@ do-install: -e 's|@JDK_HOME@|${JDK_HOME}|g' \ <${PKGDIR}/MESSAGE >${MESSAGE_FILE} -.include "../../mk/bsd.pkg.mk" - show-shlib-type: echo a.out +.include "../../mk/bsd.pkg.mk" + # This needs to be after bsd.pkg.mk PREFIX:= ${JDK_HOME} |