Changeset 23356 for main/trunk/greenstone2/build-src/src

Timestamp:

2010-11-29T16:49:14+13:00 (13 years ago)

Author:

sjm84

Message:

Updated several configure scripts and Makefiles to make use of the JAVA, JAVAC and JAVACFLAGS environment variables, also added a --disable-java option to several of the configure scripts

File:

• main/trunk/greenstone2/build-src/src/java/org/nzdl/gsdl/Makefile.in (moved) (moved from main/trunk/greenstone2/build-src/src/java/org/nzdl/gsdl/Makefile ) (2 diffs)

main/trunk/greenstone2/build-src/src/java/org/nzdl/gsdl/Makefile.in

@@ -1 @@
-JAVAC = javac
+JAVAC = @JAVAC@
+JAVACFLAGS = @JAVACFLAGS@
 JAR = jar
 
@@ -18 +19 @@
 
 %.class : %.java
-    $(JAVAC) -d ../../.. -classpath ../../.. $<
+    $(JAVAC) $(JAVACFLAGS) -d ../../.. -classpath ../../.. $<