* stepmake/stepmake/help2man-rules.make: Allow manpages to fail

when cross building.

* stepmake/stepmake/help2man-rules.make:

* configure.in: srcdir build fix.

diff --git a/ChangeLog b/ChangeLog
index 2157ac91a37cb56736cb260584d8458a57ccb4af..17b6fcda12c4d2440062f00247e606d469bfe4fe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2003-09-19  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * stepmake/stepmake/help2man-rules.make: Allow manpages to fail
+       when cross building.
+
+       * stepmake/stepmake/help2man-rules.make: 
+
+       * configure.in: srcdir build fix.
+
        * cygwin/GNUmakefile:
        * cygwin/lily-wins.py:
        * cygwin/postremove-lilypond.sh: 

diff --git a/configure.in b/configure.in
index 4a48fb099bf4ee4d163c5fd5a72e7f3f77546cd3..a78d20d4ffc874c78431e79624871cecf67f3421 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -12,7 +12,7 @@ AC_CONFIG_AUX_DIR([stepmake/bin])
 
 
 
-. VERSION 
+. $srcdir/VERSION 
 
 STEPMAKE_INIT
 

diff --git a/stepmake/stepmake/help2man-rules.make b/stepmake/stepmake/help2man-rules.make
index 10b668d36a5e820685341b6efa7a0f024b7e10a7..0f4559ae30091295e042a86327806d3fc6d09a5d 100644 (file)
--- a/stepmake/stepmake/help2man-rules.make
+++ b/stepmake/stepmake/help2man-rules.make
@@ -22,5 +22,16 @@ endif
 
 HELP2MAN_COMMAND = $(PERL) $(builddir)/buildscripts/$(outbase)/help2man $< > $@
 
+ifeq ($(cross),))
 $(outdir)/%.1: $(outdir)/%
        $(HELP2MAN_COMMAND)
+else
+# When cross building, some manpages will not build because the executable
+# does not run.  We don not want to disable building manpages, because
+# the cross build process may generate them using a native executable.
+$(outdir)/%.1: $(outdir)/%
+       $(HELP2MAN_COMMAND) || \
+       (echo ""; echo "Apparently the man pages failed to build. This is";\
+        echo "no problem, since they don't contain any information anyway.";\
+        echo "Please run make again, and be prepared for NO manual pages.")
+endif