Bugfix: copy aclocal.m4, autogen.sh also if

they do not exist.

diff --git a/ChangeLog b/ChangeLog
index bb32e1d964b633d4b79e30d2d01bffcf75ce361e..cb74e7580ec5b0b0411e8fb982cf0935b5c5fa71 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-26  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * stepmake/autogen.sh: Bugfix: copy aclocal.m4, autogen.sh also if
+       they do not exist.
+
 2003-08-26  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * VERSION (PACKAGE_NAME): released 1.9.1 

diff --git a/autogen.sh b/autogen.sh
index ea9bb388ceae2fdc44d3d81689c4858317c228d4..b5406534030d42e4c639dc28a0295cebdb58d114 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,13 +4,13 @@
 srcdir=`dirname $0`
 
 
-if [ stepmake/aclocal.m4 -nt aclocal.m4 ]; then
-    echo "stepmake/aclocal.m4 is newer. Copying file." 
+if [ ! -f aclocal.m4 -o stepmake/aclocal.m4 -nt aclocal.m4 ]; then
+    echo "stepmake/aclocal.m4 is newer.  Copying file." 
     cp -f stepmake/aclocal.m4 aclocal.m4
 fi
 
-if [ stepmake/autogen.sh -nt autogen.sh ]; then
-    echo "stepmake/autogen.sh is newer. Copying file." 
+if [ ! -f autogen.sh -o stepmake/autogen.sh -nt autogen.sh ]; then
+    echo "stepmake/autogen.sh is newer.  Copying file." 
     cp -f stepmake/autogen.sh autogen.sh
     exec ./autogen.sh
 fi

diff --git a/cygwin/mknetrel b/cygwin/mknetrel
index 293e8a8ff9fc6660fc125f7f1b50eefbe942e2d3..aee68a7e928e1424a4833ad14521fa62b376f703 100644 (file)
--- a/cygwin/mknetrel
+++ b/cygwin/mknetrel
@@ -69,7 +69,7 @@ EOF
     chmod 755 guile-config
     PATH=$(pwd):$PATH
 
-
+    export CFLAGS="-fpermissive"
     if [ "$ABI" != "1.5" ];then
        export LDFLAGS="$cygwin_prefix/bin/cygkpathsea-3abi13.dll"
     fi

diff --git a/stepmake/autogen.sh b/stepmake/autogen.sh
index ea9bb388ceae2fdc44d3d81689c4858317c228d4..05b2eae55cb2e6b92f0e1c0f44e4d174ba62da2d 100755 (executable)
--- a/stepmake/autogen.sh
+++ b/stepmake/autogen.sh
@@ -4,12 +4,12 @@
 srcdir=`dirname $0`
 
 
-if [ stepmake/aclocal.m4 -nt aclocal.m4 ]; then
+if [ ! -f aclocal.m4 -o stepmake/aclocal.m4 -nt aclocal.m4 ]; then
     echo "stepmake/aclocal.m4 is newer. Copying file." 
     cp -f stepmake/aclocal.m4 aclocal.m4
 fi
 
-if [ stepmake/autogen.sh -nt autogen.sh ]; then
+if [ ! -f autogen.sh -o stepmake/autogen.sh -nt autogen.sh ]; then
     echo "stepmake/autogen.sh is newer. Copying file." 
     cp -f stepmake/autogen.sh autogen.sh
     exec ./autogen.sh