diff options
| author | Rainer Jung <rjung@apache.org> | 2010-10-02 12:24:58 +0000 |
|---|---|---|
| committer | Rainer Jung <rjung@apache.org> | 2010-10-02 12:24:58 +0000 |
| commit | 4c6d022eb49fbaa04dc8031ca91f6946bf4f6f04 (patch) | |
| tree | 08db073cf8acf69369251b10b8288657279f61a5 | |
| parent | b0ec13b6e2208a891f639794944e0ed36080882f (diff) | |
| download | apr-4c6d022eb49fbaa04dc8031ca91f6946bf4f6f04.tar.gz | |
- remove force flag from libtoolize:
- we don't want our config.(guess|sub) be
overwritten by whatever is installed
on the RM system
- we already clean up all other files copied
in at the beginning of the script
- chmod: was previously located in front of
the "cat", which gave an error if the file was
not there. Since we try to override immediately
after, changed to "rm -f".
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1003783 13f79535-47bb-0310-9956-ffa450edef68
| -rwxr-xr-x | buildconf | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -50,7 +50,7 @@ lt_pversion=`$libtoolize --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*// lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'` IFS=.; set $lt_version; IFS=' ' if test "$1" = "1"; then - $libtoolize --copy --automake --force $verbose + $libtoolize --copy --automake $verbose if [ -f libtool.m4 ]; then ltfile=`pwd`/libtool.m4 else @@ -69,11 +69,11 @@ if test "$1" = "1"; then fi # Do we need this anymore? echo "buildconf: Using libtool.m4 at ${ltfile}." + rm -f build/libtool.m4 cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4 - chmod u+w build/libtool.m4 fi if test "$1" = "2"; then - $libtoolize --copy --automake --force $verbose + $libtoolize --copy --automake $verbose # Wouldn't it just be better to define top_builddir?? mv build/libtool.m4 build/libtool.m4.$$ cat build/libtool.m4.$$ | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4 |