Doc-zh: fix bad committishes

[lilypond.git] / stepmake / stepmake / help2man-rules.make

diff --git a/stepmake/stepmake/help2man-rules.make b/stepmake/stepmake/help2man-rules.make
index bf059e4a682f0208063a1d729f97f7c016b91bd6..9e2f042128d0fd8a6d00ae6a6698d7f7b14fb2af 100644 (file)
--- a/stepmake/stepmake/help2man-rules.make
+++ b/stepmake/stepmake/help2man-rules.make
@@ -1,10 +1,5 @@
-ifneq ($(outdir),./out)
-$(outdir)/%.1: out/%.1
-       cp $< $@
-endif
-
 # We must invoke the generated $(outdir)/help2man script instead of
-# the help2man.pl source, which means that the buildscripts directory
+# the help2man.pl source, which means that the scripts/build directory
 # must be built first.
 #
 # From the perlrun man-page:
@@ -20,12 +15,29 @@ endif
 # cases.  Four more explaining what a line comment is, and that it may
 # be parsed, same here.
 
-HELP2MAN_COMMAND = $(PERL) $(builddir)/buildscripts/$(outbase)/help2man $< > $@
+ifeq ($(PYTHON),$(TARGET_PYTHON))
+HELP2MAN_COMMAND = $(buildscript-dir)/help2man $< > $@
+else
+HELP2MAN_COMMAND = $(buildscript-dir)/help2man "env $$(basename $$(head -1 $<)) $<" > $@
+endif
+
+ifeq ($(strip $(CROSS)),no)
+$(outdir)/%.1: $(outdir)/% $(buildscript-dir)/help2man
+       echo $(buildscript-dir)/help2man
+       $(HELP2MAN_COMMAND)
+else
+# When cross building, some manpages will not build because the
+# executable does not run.  We assume the manpages to be generated
+# during a previous compile for the build host, with config=for-build,
+# in the directory $(outdir)-for-build.
+$(outdir)/%.1: $(outdir:%=%-for-build)/%.1
+       cp $< $@
+endif
+
+ifneq ($(outdir),./out)
+$(outdir)/%.1: out/%.1
+       cp $< $@
+endif
 
-$(outdir)/%.1: $(outdir)/%
-       @echo "generating man page from $< --help"
-       @echo "$(HELP2MAN_COMMAND)"
-       @$(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.")
+$(buildscript-dir)/help2man:
+       $(MAKE) -C $(depth)/scripts/build