diff options
| author | William S Fulton <wsf@fultondesigns.co.uk> | 2013-01-18 17:12:15 -0800 |
|---|---|---|
| committer | William S Fulton <wsf@fultondesigns.co.uk> | 2013-01-18 17:12:15 -0800 |
| commit | 1ccefb03ef629f5efc9b914000d4c1d6d253a01b (patch) | |
| tree | 5d2c0cd8e63d56652b3e7951ebb82b58685ee3e5 | |
| parent | bda67e1d780b1d4363db058c294b5eb714f7bedd (diff) | |
| parent | 0e32be246500e78089327f323794f1e5d7af879b (diff) | |
| download | swig-1ccefb03ef629f5efc9b914000d4c1d6d253a01b.tar.gz | |
Merge pull request #16 from tristan0x/static-pcre-build
Prefer $MAKE if specified in environment
| -rwxr-xr-x | Tools/pcre-build.sh | 4 |
1 files changed, 2 insertions, 2 deletions
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." |