Changeset 36531 for main/trunk
- Timestamp:
- 2022-08-29T13:21:36+12:00 (20 months ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/src/packages/javagdbm/java/Makefile.in
r35640 r36531 8 8 # 'javah' existed until JDK 1.7, transitional in JDK 1.8, then removed by JDK 1.9 (use 'javac -h' instead) 9 9 # Makefile rules below test for 'javah' and use it if it found, otherwise runs with 'javac -h' version 10 JAVAH = javah 10 # 11 # Since we're committed to JAVA_HOME being set, so jni.h header files can be found, 12 # then we can lean on JAVA_HOME here to more precisely check for the existence of javah 13 # within JAVA_HOME, and not accidentally pick up on another (older) JDK that is also 14 # installed on the system, and does come with a 'javah' but is unlikely to be able 15 # to cope with newer (e.g. JDK 11) version class files 16 JAVAH = $(JAVA_HOME)/javah 11 17 JAR = jar 12 18 … … 29 35 @echo Checking for javah ... 30 36 # $(eval found = $(shell which javah 2>/dev/null | wc -l)) 31 $(eval found = $(shell command -v javah| wc -l))37 $(eval found = $(shell command -v $(JAVAH) | wc -l)) 32 38 @if test "$(found)" = "1" ; then \ 33 39 echo "... found" ; \
Note:
See TracChangeset
for help on using the changeset viewer.