Merge branch 'master' of github.com:swig/swig

This commit is contained in:
William S Fulton 2013-01-19 01:29:40 +00:00
commit 88a64208ae
2 changed files with 4 additions and 4 deletions

View file

@ -3,8 +3,8 @@
#######################################################################
LANGUAGE = java
JAVA = java
JAVAC = javac
JAVA = @JAVA@
JAVAC = @JAVAC@
JAVAFLAGS = -Xcheck:jni
SCRIPTSUFFIX = _runme.java
srcdir = @srcdir@

View file

@ -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."