From 6d641c68de8b3ea29f95ee0c3ea5aaeb3ca7a098 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 19 Sep 2003 21:43:44 +0000 Subject: [PATCH] * stepmake/stepmake/help2man-rules.make: Allow manpages to fail when cross building. * stepmake/stepmake/help2man-rules.make: * configure.in: srcdir build fix. --- ChangeLog | 7 +++++++ configure.in | 2 +- stepmake/stepmake/help2man-rules.make | 11 +++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2157ac91a3..17b6fcda12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2003-09-19 Jan Nieuwenhuizen + * 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 4a48fb099b..a78d20d4ff 100644 --- 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 10b668d36a..0f4559ae30 100644 --- 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 -- 2.39.2