svn commit: r1003783 - /apr/apr/trunk/buildconf

[rj...@apache.org]

Author: rjung
Date: Sat Oct  2 12:24:58 2010
New Revision: 1003783

URL: http://svn.apache.org/viewvc?rev=1003783&view=rev
Log:
- 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".

Modified:
    apr/apr/trunk/buildconf

Modified: apr/apr/trunk/buildconf
URL: http://svn.apache.org/viewvc/apr/apr/trunk/buildconf?rev=1003783&r1=1003782&r2=1003783&view=diff
==============================================================================
--- apr/apr/trunk/buildconf (original)
+++ apr/apr/trunk/buildconf Sat Oct  2 12:24:58 2010
@@ -50,7 +50,7 @@ lt_pversion=`$libtoolize --version 2>/de
 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