move debians help2man to a quilt patch

diff --git a/debian/patches/use_debians_help2man b/debian/patches/use_debians_help2man
new file mode 100644 (file)
index 0000000..67f83a9
--- /dev/null
+++ b/debian/patches/use_debians_help2man
@@ -0,0 +1,37 @@
+--- lilypond-2.18.0.orig/stepmake/stepmake/help2man-rules.make
++++ lilypond-2.18.0/stepmake/stepmake/help2man-rules.make
+@@ -1,24 +1,8 @@
+-# We must invoke the generated $(outdir)/help2man script instead of
+-# the help2man.pl source, which means that the scripts/build directory
+-# must be built first.
+-#
+-# From the perlrun man-page:
+-#
+-#     If the #! line does not contain the word "perl", the
+-#       program named after the #! is executed instead of the Perl
+-#       interpreter.  This is slightly bizarre, but it helps
+-#
+-# Indeed it is.  Perl sucks.
+-#
+-# Two screenfulls explaining that the otherwise standard #! is broken
+-# for perl, and arguing that this broken magic is better in some
+-# cases.  Four more explaining what a line comment is, and that it may
+-# be parsed, same here.
+-
++# The distributed help2man sucks; use the Debian version instead.
+ ifeq ($(PYTHON),$(TARGET_PYTHON))
+-HELP2MAN_COMMAND = $(buildscript-dir)/help2man $< > $@
++HELP2MAN_COMMAND = help2man $< > $@
+ else
+-HELP2MAN_COMMAND = $(buildscript-dir)/help2man "env $$(basename $$(head -1 $<)) $<" > $@
++HELP2MAN_COMMAND = help2man "env $$(basename $$(head -1 $<)) $<" > $@
+ endif
+ 
+ ifeq ($(strip $(CROSS)),no)
+@@ -37,6 +21,3 @@
+ $(outdir)/%.1: out/%.1
+       cp $< $@
+ endif
+-
+-$(buildscript-dir)/help2man:
+-      $(MAKE) -C $(depth)/scripts/build

diff --git a/stepmake/stepmake/help2man-rules.make b/stepmake/stepmake/help2man-rules.make
index 22aa9c8eab0376f902b08456165336257b2b97b3..6c176bac5e7b0995cf33ee66ed452cb4e2bc802a 100644 (file)
--- a/stepmake/stepmake/help2man-rules.make
+++ b/stepmake/stepmake/help2man-rules.make
@@ -1,8 +1,24 @@
-# The distributed help2man sucks; use the Debian version instead.
+# We must invoke the generated $(outdir)/help2man script instead of
+# the help2man.pl source, which means that the scripts/build directory
+# must be built first.
+#
+# From the perlrun man-page:
+#
+#      If the #! line does not contain the word "perl", the
+#       program named after the #! is executed instead of the Perl
+#       interpreter.  This is slightly bizarre, but it helps
+#
+# Indeed it is.  Perl sucks.
+#
+# Two screenfulls explaining that the otherwise standard #! is broken
+# for perl, and arguing that this broken magic is better in some
+# cases.  Four more explaining what a line comment is, and that it may
+# be parsed, same here.
+
 ifeq ($(PYTHON),$(TARGET_PYTHON))
-HELP2MAN_COMMAND = help2man $< > $@
+HELP2MAN_COMMAND = $(buildscript-dir)/help2man $< > $@
 else
-HELP2MAN_COMMAND = help2man "env $$(basename $$(head -1 $<)) $<" > $@
+HELP2MAN_COMMAND = $(buildscript-dir)/help2man "env $$(basename $$(head -1 $<)) $<" > $@
 endif
 
 ifeq ($(strip $(CROSS)),no)
@@ -21,3 +37,6 @@ ifneq ($(outdir),./out)
 $(outdir)/%.1: out/%.1
        cp $< $@
 endif
+
+$(buildscript-dir)/help2man:
+       $(MAKE) -C $(depth)/scripts/build