From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 26 Aug 2003 18:56:37 +0000 (+0000)
Subject: Bugfix: copy aclocal.m4, autogen.sh also if
X-Git-Tag: release/1.9.2~15
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5e8059cd76db864f08022b7cf05b3a808eefd267;hp=9e042e662281d7361e6be85068366c8911512c4e;p=lilypond.git

Bugfix: copy aclocal.m4, autogen.sh also if
they do not exist.
---

diff --git a/ChangeLog b/ChangeLog
index bb32e1d964..cb74e7580e 100644
--- 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 ea9bb388ce..b540653403 100755
--- 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 293e8a8ff9..aee68a7e92 100644
--- 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 ea9bb388ce..05b2eae55c 100755
--- 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