diff options
| author | Colin Walters <walters@verbum.org> | 2010-07-09 15:08:38 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2010-07-09 15:08:38 -0400 |
| commit | 056b7cb878817497f11db5164687ea13cfbeb1aa (patch) | |
| tree | 44a14212de5453e3f90a49d00127d4915d04ed95 /bin | |
| parent | 76ccb5a15a3ec3b741deefee1164ce972ac00ee1 (diff) | |
| download | homegit-MOVED-TO-GNOME-056b7cb878817497f11db5164687ea13cfbeb1aa.tar.gz homegit-MOVED-TO-GNOME-056b7cb878817497f11db5164687ea13cfbeb1aa.tar.xz homegit-MOVED-TO-GNOME-056b7cb878817497f11db5164687ea13cfbeb1aa.zip | |
Various build fixes
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/build | 26 |
1 files changed, 17 insertions, 9 deletions
@@ -7,22 +7,30 @@ if test -z "$root"; then exit 1 fi shift || true +if test -d /lib64; then + libdir=$root/lib64 +else + libdir=$root/lib +fi +configargs="--prefix=$root --libdir=$libdir $@" if ! test -x configure; then - if test -d /lib64; then - libdir=$root/lib64 - else - libdir=$root/lib - fi - configargs="--prefix=$root --libdir=$libdir $@" if test -f autogen.sh; then inroot $root ./autogen.sh $configargs else autoreconf -f -i - inroot $root configure $configargs + inroot $root ./configure $configargs + fi +fi +# We need to rerun configure if the prefix changed +prefix_matches=yes +if test -f config.log; then + previous_prefix=$(grep '^prefix=' config.log | cut -f 2 -d '=') + if test previous_prefix != $root; then + prefix_matches=no fi fi -if ! test -f Makefile; then - inroot $root configure $configargs +if ! test -f Makefile || test x$prefix_matches = xno; then + inroot $root ./configure $configargs fi nproc=$(($(grep -c ^processor /proc/cpuinfo) * 2)) make -j $nproc $MAKEARGS |