Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/greenstone2/common-src/indexers/mgpp/java/org/greenstone/mgpp/Makefile.in

    r19927 r23356  
    1414CC = @CC@
    1515CXX = @CXX@
    16 JAVAC = javac
     16JAVAC = @JAVAC@
    1717JAVAH = javah
    1818JAR = jar
    1919CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -ansi -DSILENT -DSHORT_SUFFIX
    2020CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@ -DSILENT -DSHORT_SUFFIX
     21JAVACFLAGS = @JAVACFLAGS@
    2122DEFS = @DEFS@
    2223RANLIB = @RANLIB@
    … …  
    4748
    4849compile: setup
    49     "$(JAVAC)" -d "$(JAVACLASSDIR)" -sourcepath "$(JAVASRCDIR)" $(JAVACOPTIONS) *.java
     50    "$(JAVAC)" $(JAVACFLAGS) -d "$(JAVACLASSDIR)" -sourcepath "$(JAVASRCDIR)" $(JAVACOPTIONS) *.java
    5051    "$(JAVAH)" -classpath "$(JAVACLASSPATH)" -d "$(MGPPHOME)/jni" org.greenstone.mgpp.MGPPPassesWrapper
    5152    "$(JAVAH)" -classpath "$(JAVACLASSPATH)" -d "$(MGPPHOME)/jni" org.greenstone.mgpp.MGPPSearchWrapper
Note: See TracChangeset for help on using the changeset viewer.