From 224a0064054ac3b8c2ee6bcdc74434731b0efbe4 Mon Sep 17 00:00:00 2001 From: jwise Date: Sat, 15 Jan 2000 02:08:03 +0000 Subject: 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. --- lang/jdk/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lang') 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} -- cgit v1.2.3