Changeset 33929

Timestamp:

2020-02-15T18:57:27+13:00 (4 years ago)

Author:

davidb

Message:

Newer JDKs don't have javah => make file change that takes account of this

File:

• main/trunk/greenstone3/src/packages/javagdbm/java/Makefile.in (modified) (2 diffs)

main/trunk/greenstone3/src/packages/javagdbm/java/Makefile.in

@@ -2 +2 @@
 # Katherine Don, 2005
 
-JAVAC = $(JAVA_HOME)/bin/javac
-JAVAH = $(JAVA_HOME)/bin/javah
-JAR = $(JAVA_HOME)/bin/jar
+#JAVAC = $(JAVA_HOME)/bin/javac
+#JAVAH = $(JAVA_HOME)/bin/javah
+#JAR = $(JAVA_HOME)/bin/jar
+JAVAC = @JAVAC@
+JAVAH = javah
+JAR = jar
 
 JAVAGDBMHOME=../
@@ -19 +22 @@
 compile: setup
     $(JAVAC) -d $(JAVACLASSDIR) -sourcepath $(JAVASRCDIR) $(JAVACOPTIONS) au/com/pharos/*/*.java
-    $(JAVAH) -o $(JAVAGDBMHOME)/jni/GdbmFile.h -classpath $(JAVACLASSPATH) au.com.pharos.gdbm.GdbmFile
-    $(JAR) cf $(JAVAGDBMHOME)/javagdbm.jar -C $(JAVACLASSDIR) au
+    @echo Checking for javah ...
+    @found=`which javah | wc -l`
+    @if test "$(found)" = "1" ; then \
+      echo ... found ; \
+      echo javah -o $(JAVAGDBMHOME)/jni/GdbmFile.h -classpath $(JAVACLASSPATH) au.com.pharos.gdbm.GdbmFile ; \
+      javah -o $(JAVAGDBMHOME)/jni/GdbmFile.h -classpath $(JAVACLASSPATH) au.com.pharos.gdbm.GdbmFile ; \
+    else \
+      echo ... not found => using 'javac -h' ; \
+      echo $(JAVAC) -h $(JAVAGDBMHOME)/jni -classpath $(JAVACLASSPATH) -d java au/com/pharos/gdbm/GdbmFile.java ; \
+      $(JAVAC) -h $(JAVAGDBMHOME)/jni -classpath $(JAVACLASSPATH) -d java au/com/pharos/gdbm/GdbmFile.java ; \
+    fi
+    jar cf $(JAVAGDBMHOME)/javagdbm.jar -C $(JAVACLASSDIR) au
 
 clean: