* stepmake/aclocal.m4: Robustification for (gcc) version detection.

* cygwin/postinstall-lilypond.sh: Do not fail if info docs aren't
available.  This should be moved to postinstall-lilypond-doc.

diff --git a/ChangeLog b/ChangeLog
index 03bcc380c316cf438fa73a46037cad3b02a947a6..b46246a796e3d8d9d73017fcb508b59f66c577bf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-01  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * stepmake/aclocal.m4: Robustification for (gcc) version detection.
+
+       * cygwin/postinstall-lilypond.sh: Do not fail if info docs aren't
+       available.  This should be moved to postinstall-lilypond-doc.
+
 2006-06-01  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
        * lily/ledger-line-engraver.cc (acknowledge_staff_symbol): only

diff --git a/cygwin/postinstall-lilypond.sh b/cygwin/postinstall-lilypond.sh
index fbffab2c3eb6c409bbb0cf091fab6df4389cd9c3..257100cf7fe47c07358737573c1c5da5f3a3b110 100644 (file)
--- a/cygwin/postinstall-lilypond.sh
+++ b/cygwin/postinstall-lilypond.sh
@@ -26,4 +26,5 @@ regtool set '/root/LilyPond/shell/generate/' '&Generate PDF ...'
 regtool add '/root/LilyPond/shell/generate/command'
 regtool set '/root/LilyPond/shell/generate/command/' $ROOT'\bin\bash.exe --login -c '"'"'/usr/bin/lily-wins "%1"'"'"
 
-(cd /usr/share/info/lilypond && ln -sf ../../doc/lilypond/Documentation/user/out-www/*png .)
+# FIXME: move to new postinstall-lilypond-doc.sh
+[ -d /usr/share/info/lilypond ] && (cd /usr/share/info/lilypond && ln -sf ../../doc/lilypond/Documentation/user/out-www/*png .)

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 5a9e739ad98b0c5c1cae48c71f76f66da272e5d5..482c73a3cb65a9920ba6803e6f374251438c83d7 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -32,8 +32,8 @@ AC_DEFUN(STEPMAKE_GET_VERSION, [
     ## FIXME: what systems still do not have $() in /bin/sh?
     eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 | grep '[0-9]\.[0-9]' \
         | head -n 1 \
-       | sed -e 's/.*[^-.0-9]\([0-9][0-9]*\.[0-9][.0-9]*\).*/\1/' \
-           -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\"
+        | sed -e 's/\([0-9][0-9]*\.[0-9][.0-9]*\).*/\1/' \
+         -e 's/\([^0-9]*\|^\) //' -e 's/[^0-9]*$//'\`\"
     if test -z "$_ver"; then
         ## If empty, try date [fontforge]
         eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 | grep '[0-9]\{6,8\}' \