r15092 - gnucash/trunk/packaging/win32 - Do not simply touch install-sh because we need that from automake

[Andreas Köhler]

Author: andi5
Date: 2006-11-06 18:52:44 -0500 (Mon, 06 Nov 2006)
New Revision: 15092
Trac: http://svn.gnucash.org/trac/changeset/15092

Modified:
   gnucash/trunk/packaging/win32/install.sh
Log:
Do not simply touch install-sh because we need that from automake
--add-missing. Warn the user if he has put install.sh in ., .., or
.\.. from the repository. Improves r15037.


Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh	2006-11-06 22:17:42 UTC (rev 15091)
+++ gnucash/trunk/packaging/win32/install.sh	2006-11-06 23:52:44 UTC (rev 15092)
@@ -83,6 +83,24 @@
 }
 
 function prepare() {
+    # Necessary so that intltoolize doesn't come up with some
+    # foolish AC_CONFIG_AUX_DIR; bug#362006
+    # We cannot simply create install-sh in the repository, because
+    # this will confuse other parts of the tools
+    _REPOS_UDIR=`unix_path $REPOS_DIR`
+    level0=.
+    level1=$(basename ${_REPOS_UDIR})
+    level2=$(basename $(dirname ${_REPOS_UDIR}))"/"$level1
+    for mydir in $level0 $level1 $level2; do
+        if [ -f $mydir/gnucash.m4 ]; then
+            die "Do not save install.sh in the repository or one its parent directories"
+        fi
+    done
+    # Remove old empty install-sh files
+    if [ -f ${_REPOS_UDIR}/install-sh -a "$(cat ${_REPOS_UDIR}/install-sh | wc -l)" -eq 0 ]; then
+        rm -f ${_REPOS_UDIR}/install-sh
+    fi
+
     mkdir -p $TMP_DIR
     mkdir -p $DOWNLOAD_DIR
     for _ENV in $ENV_VARS; do
@@ -705,9 +723,6 @@
     _GNUCASH_WFSDIR=`win_fs_path $GNUCASH_DIR`
     _GNUCASH_UDIR=`unix_path $GNUCASH_DIR`
     qpushd $REPOS_DIR
-    # Necessary so that intltoolize doesn't come up with some
-    # foolish AC_CONFIG_AUX_DIR; bug#362006 
-    touch install-sh
     if test "x$cross_compile" = xyes ; then
 	# Set these variables manually because of cross-compiling
 	export GUILE_LIBS="${GUILE_LDFLAGS} -lguile -lguile-ltdl"