Module Name:	pkgsrc
Committed By:	jwise
Date:		Sat Jan 15 02:08:04 UTC 2000

Modified Files:
	pkgsrc/lang/jdk: Makefile
	pkgsrc/mk: bsd.pkg.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -r1.13 -r1.14 pkgsrc/lang/jdk/Makefile
cvs rdiff -r1.393 -r1.394 pkgsrc/mk/bsd.pkg.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.