pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Set JAVA_HOME.



Module Name:	pkgsrc-wip
Committed By:	Sunil Nimmagadda <sunil%nimmagadda.net@localhost>
Pushed By:	skn
Date:		Thu Sep 19 20:55:03 2019 +0530
Changeset:	e7f9a2dbaa716f4db05237249b1005e03d712b9a

Modified Files:
	clojure/Makefile

Log Message:
Set JAVA_HOME.

Testing and review by fox%netbsd.org@localhost, thanks.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e7f9a2dbaa716f4db05237249b1005e03d712b9a

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

diffstat:
 clojure/Makefile | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diffs:
diff --git a/clojure/Makefile b/clojure/Makefile
index 168d272c17..08ce255246 100644
--- a/clojure/Makefile
+++ b/clojure/Makefile
@@ -26,10 +26,17 @@ INSTALLATION_DIRS=	bin \
 
 WRKSRC=	${WRKDIR}/clojure-tools
 
-SUBST_CLASSES+=		java
-SUBST_STAGE.java=	pre-configure
-SUBST_FILES.java=	clojure
-SUBST_SED.java=		-e 's,PREFIX,${PREFIX}/clojure,g'
+SUBST_CLASSES+=		set-java
+SUBST_STAGE.set-java=	pre-configure
+SUBST_MESSAGE.set-java=	Setting JAVA_HOME path.
+SUBST_FILES.set-java=	clojure
+SUBST_SED.set-java=	-e '/^JAVA_CMD=/s,java,${PKG_JAVA_HOME}/bin/java,'
+
+SUBST_CLASSES+=		set-base
+SUBST_STAGE.set-base=	pre-configure
+SUBST_MESSAGE.set-base=	Setting package base path.
+SUBST_FILES.set-base=	clojure
+SUBST_SED.set-base=	-e 's,PREFIX,${PREFIX}/clojure,g'
 
 DEPENDS+=	rlwrap-[0-9]*:../../misc/rlwrap
 


Home | Main Index | Thread Index | Old Index