"import" libtool file preservation code from build.mk

1 files changed, 12 insertions, 6 deletions

diff --git a/makedist b/makedist
index 4bbc9e5ff3..f10e342cae 100755
--- a/makedist
+++ b/makedist
@@ -32,6 +32,7 @@ ZENDROOT=:pserver:cvsread@cvs.zend.com:/repository
 PHPMOD=php4
 ZENDMOD=libzend
 TSRMMOD=TSRM
+LT_TARGETS='ltconfig ltmain.sh config.guess config.sub'
 
 if echo '\c' | grep -s c >/dev/null 2>&1
 then
@@ -98,9 +99,13 @@ echo ""
 # remove CVS stuff...
 find . \( \( -name CVS -type d \) -o -name .cvsignore \) -exec rm -rf {} \;
 
-# hide away our own ltconfig/ltmain so they won't be overwritten
-mv ltconfig ltconfig.php
-mv ltmain.sh ltmain.sh.php
+# hide away our own versions of libtool-generated files
+for i in $LT_TARGETS; do
+  if test -f "$i"; then
+    mv $i $i.bak
+    cp $i.bak $i
+  fi
+done
 
 # generate some files so people don't need bison, flex and autoconf
 # to install
@@ -112,9 +117,10 @@ set -x
 echo "/* Dummy File */" > ext/bcmath/number.c
 echo "/* Dummy File */" > ext/bcmath/number.h
 
-# now restore our own ltconfig/ltmain.sh files
-mv ltconfig.php ltconfig
-mv ltmain.sh.php ltmain.sh
+# now restore our versions of libtool-generated files
+for i in $LT_TARGETS; do
+  test -f "$i" && mv $i.bak $i
+done
 
 cd $MY_OLDPWD
 $ECHO_N "makedist: making gzipped tar archive...$ECHO_C"