diff options
| author | William S Fulton <wsf@fultondesigns.co.uk> | 2013-01-19 01:29:40 +0000 |
|---|---|---|
| committer | William S Fulton <wsf@fultondesigns.co.uk> | 2013-01-19 01:29:40 +0000 |
| commit | 88a64208ae4cd6e16850d3c37bce6e940d6625bc (patch) | |
| tree | f4b2c0210b6c266a53cdf2110d4a8587c9b73e0c | |
| parent | 751bedf5e5a95b104ca37a7baef71e188127016d (diff) | |
| parent | 6fafa8cecc496063dd0278315285ee4bfcbe97de (diff) | |
| download | swig-88a64208ae4cd6e16850d3c37bce6e940d6625bc.tar.gz | |
Merge branch 'master' of github.com:swig/swig
| -rw-r--r-- | Examples/test-suite/java/Makefile.in | 4 | ||||
| -rwxr-xr-x | Tools/pcre-build.sh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Examples/test-suite/java/Makefile.in b/Examples/test-suite/java/Makefile.in index c62dfa595..e4f3c6b58 100644 --- a/Examples/test-suite/java/Makefile.in +++ b/Examples/test-suite/java/Makefile.in @@ -3,8 +3,8 @@ ####################################################################### LANGUAGE = java -JAVA = java -JAVAC = javac +JAVA = @JAVA@ +JAVAC = @JAVAC@ JAVAFLAGS = -Xcheck:jni SCRIPTSUFFIX = _runme.java srcdir = @srcdir@ diff --git a/Tools/pcre-build.sh b/Tools/pcre-build.sh index 68ffe0b03..4af7deca3 100755 --- a/Tools/pcre-build.sh +++ b/Tools/pcre-build.sh @@ -48,8 +48,8 @@ echo "Configuring PCRE in directory: pcre" mv $pcre_dir pcre || bail "Could not create pcre directory" cd pcre && ./configure --prefix=$pcre_install_dir --disable-shared $* || bail "PCRE configure failed" echo "Building PCRE..." -make -s || bail "Could not build PCRE" +${MAKE:make} -s || bail "Could not build PCRE" echo "Installing PCRE locally to $pcre_install_dir..." -make -s install || bail "Could not install PCRE" +${MAKE:make} -s install || bail "Could not install PCRE" echo "" echo "The SWIG configure script can now be run, whereupon PCRE will automatically be detected and used from $pcre_install_dir/bin/pcre-config." |