From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Thu, 27 Feb 2003 09:53:43 +0000 (+0000)
Subject: * cygwin/mknetrel: Exit if doc build fails.
X-Git-Tag: release/1.7.14~19
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e510c00b33874066469986d9102fb7c1e127ba96;p=lilypond.git

* cygwin/mknetrel: Exit if doc build fails.

* lily/GNUmakefile: Add hack for .deps and --srcdir build.
---

diff --git a/ChangeLog b/ChangeLog
index cd7890d0af..8d8e8d581c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-26  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	* cygwin/mknetrel: Exit if doc build fails.
+
+	* lily/GNUmakefile: Add hack for .deps and --srcdir build.
+
 2003-02-27  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
 	* scm/music-types.scm (music-descriptions): add doc strings
diff --git a/cygwin/mknetrel b/cygwin/mknetrel
index b2f32622b2..fbac630e42 100644
--- a/cygwin/mknetrel
+++ b/cygwin/mknetrel
@@ -10,7 +10,7 @@
 # To use this, do something like:
 cat >/dev/null <<EOC
 
-   wget -P/var/tmp ftp://lilypond.org/pub/LilyPond/v1.6/lilypond-1.6.3.tar.gz
+   wget -P/var/tmp ftp://lilypond.org/pub/LilyPond/v1.7/lilypond-1.7.13.tar.gz
    rm -rf /home/netrel/src/lilypond-*
    mkdir -p /home/netrel/src && cd /home/netrel/src
    ## TODO: look at pimport
@@ -29,7 +29,8 @@ patch=$mknetrel_root/patch
 if iscygwin; then
     true
 else    
-    uploads=$here/uploads/$base && mkdir -p $uploads
+    ##uploads=$here/uploads/$base && mkdir -p $uploads
+    uploads=$here/uploads-development/$base && mkdir -p $uploads
     tarstem=$uploads/$package
 fi
 
@@ -295,7 +296,9 @@ prebuild () {
     cd $src && ln -s GNUmakefile.in GNUmakefile
 
     cd $build || exit 1
-    PATH=/bin:/usr/bin:$PATH make conf=for-build all doc html-doc
+    # Ugh.  Fixed in 1.6.8CVS and 1.7.13CVS.
+    # PATH=/bin:/usr/bin:$PATH make DO_O_DEP="echo NO DEPS;" conf=for-build all doc html-doc || exit 1
+    PATH=/bin:/usr/bin:$PATH make conf=for-build all doc html-doc || exit 1
     for i in $(find . -path "out-for-build/*.1"); do
 	cp -pv $i $(dirname $(dirname $i))/$(basename $i)
     done
diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index 79a516e0b2..e1be486358 100644
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -21,7 +21,7 @@ include $(depth)/make/stepmake.make
 
 ETAGS_FLAGS += -r '/^LY_DEFINE *(\([^,]+\),/\1/'  -r '/^LY_DEFINE *([^,]+, *"\([^"]+\)"/\1/' 
 
-default: 
+default:
 
 # force these: Make can't know these have to be generated in advance
 $(outdir)/my-lily-parser.o: $(outdir)/parser.hh
@@ -31,3 +31,9 @@ $(outdir)/lexer.o: $(outdir)/parser.hh $(outdir)/version.hh
 $(outdir)/kpath.o: $(outdir)/version.hh
 $(outdir)/lily-guile.o: $(outdir)/version.hh
 $(outdir)/lily-version.o: $(outdir)/version.hh
+
+# ugh.  For --srcdir builds, these must exist to satisfy their broken
+# lexer.dep and parser.dep file entries.
+ifneq ($(srcdir), .)
+.PRECIOUS: $(outdir)/lexer.cc $(outdir)/parser.cc
+endif