diff options
| author | schmonz <schmonz> | 2002-07-28 13:16:46 +0000 |
|---|---|---|
| committer | schmonz <schmonz> | 2002-07-28 13:16:46 +0000 |
| commit | b80eaf873ae2be14cf9e8768a9cad5a79076b14b (patch) | |
| tree | 84dbe99c62cd5b64dc4bbfafc4d02012e40edcda | |
| parent | 5ab453bd6b2d01e831a514031501f9c1a954b55f (diff) | |
| download | pkgsrc-b80eaf873ae2be14cf9e8768a9cad5a79076b14b.tar.gz | |
Uncomment inadvertently out-commented JDK_HOME definition. Sprinkle
some Darwin ifdefs. Now that we can't rely on
"emulators/suse_linux/Makefile.application" being included, include
bsd.pkg.mk directly.
| -rw-r--r-- | lang/sun-jre13/Makefile.common | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/lang/sun-jre13/Makefile.common b/lang/sun-jre13/Makefile.common index 8d63e43df96..d6b688f943a 100644 --- a/lang/sun-jre13/Makefile.common +++ b/lang/sun-jre13/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2002/07/28 11:57:41 schmonz Exp $ +# $NetBSD: Makefile.common,v 1.3 2002/07/28 13:16:46 schmonz Exp $ # MASTER_SITES is very special, and must end in "=": CATEGORIES= lang @@ -21,7 +21,11 @@ NO_BIN_ON_FTP= ${RESTRICTED} # We need to overwrite JDK_HOME, since JRE and JDK need to be # installed in the same directory -# JDK_HOME:= ${LOCALBASE}/java/sun-1.3.1 +.if ${OPSYS} == "Darwin" +JDK_HOME= /usr +.else +JDK_HOME:= ${LOCALBASE}/java/sun-1.3.1 +.endif MESSAGE_SUBST+= JDK_HOME=${JDK_HOME} # Needs to be after bsd.prefs.mk @@ -58,8 +62,11 @@ do-install: cd ${WRKSRC} && ${PAX} -rw . ${PREFIX} . endif +.if ${OPSYS} != "Darwin" .include "../../emulators/suse_linux/Makefile.application" +.endif +.include "../../mk/bsd.pkg.mk" # These need to be after bsd.pkg.mk .if ${OPSYS} == "Linux" |