Changeset 36530 for main/trunk/greenstone2/common-src
- Timestamp:
- 2022-08-29T13:17:21+12:00 (22 months ago)
- Location:
- main/trunk/greenstone2/common-src/indexers
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/common-src/indexers/mg/java/org/greenstone/mg/Makefile.in
r35313 r36530 17 17 # 'javah' existed until JDK 1.7, transitional in JDK 1.8, then removed by JDK 1.9 (use 'javac -h' instead) 18 18 # Makefile rules below test for 'javah' and use it if it found, otherwise runs with 'javac -h' version 19 JAVAH = javah 19 # 20 # Since we're committed to JAVA_HOME being set, so jni.h header files can be found, 21 # then we can lean on JAVA_HOME here to more precisely check for the existence of javah 22 # within JAVA_HOME, and not accidentally pick up on another (older) JDK that is also 23 # installed on the system, and does come with a 'javah' but is unlikely to be able 24 # to cope with newer (e.g. JDK 11) version class files 25 JAVAH = $(JAVA_HOME)/bin/javah 20 26 JAR = jar 21 27 CFLAGS = @CFLAGS@ -ansi -DSILENT -DSHORT_SUFFIX … … 54 60 # "$(JAVAC)" -h "$(MGHOME)/jni" -classpath "$(JAVACLASSPATH)" MGPassesWrapper.java 55 61 # $(eval found = $(shell which javah 2>/dev/null | wc -l)) 56 $(eval found = $(shell command -v javah| wc -l))62 $(eval found = $(shell command -v $(JAVAH) | wc -l)) 57 63 if test "$(found)" = "1" ; then \ 58 64 "$(JAVAH)" -classpath "$(JAVACLASSPATH)" -d "$(MGHOME)/jni" org.greenstone.mg.MGWrapper ; \ -
main/trunk/greenstone2/common-src/indexers/mgpp/java/org/greenstone/mgpp/Makefile.in
r35313 r36530 17 17 # 'javah' existed until JDK 1.7, transitional in JDK 1.8, then removed by JDK 1.9 (use 'javac -h' instead) 18 18 # Makefile rules below test for 'javah' and use it if it found, otherwise runs with 'javac -h' version 19 JAVAH = javah 19 # 20 # Since we're committed to JAVA_HOME being set, so jni.h header files can be found, 21 # then we can lean on JAVA_HOME here to more precisely check for the existence of javah 22 # within JAVA_HOME, and not accidentally pick up on another (older) JDK that is also 23 # installed on the system, and does come with a 'javah' but is unlikely to be able 24 # to cope with newer (e.g. JDK 11) version class files 25 JAVAH = $(JAVA_HOME)/bin/javah 20 26 JAR = jar 21 27 CFLAGS = @CFLAGS@ -ansi -DSILENT -DSHORT_SUFFIX … … 59 65 # "$(JAVAC)" -classpath "$(JAVACLASSPATH)" -h "$(MGPPHOME)/jni" MGPPRetrieveWrapper.java 60 66 # $(eval found = $(shell which javah 2>/dev/null | wc -l)) 61 $(eval found = $(shell command -v javah| wc -l))67 $(eval found = $(shell command -v $(JAVAH) | wc -l)) 62 68 if test "$(found)" = "1" ; then \ 63 69 "$(JAVAH)" -classpath "$(JAVACLASSPATH)" -d "$(MGPPHOME)/jni" org.greenstone.mgpp.MGPPPassesWrapper ; \
Note:
See TracChangeset
for help on using the changeset viewer.