From: Anthony Fok <foka@debian.org>
Date: Fri, 27 Jan 2017 20:01:56 +0000 (-0700)
Subject: Fix FTBFS when built with dpkg-buildpackage -A
X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=55a9a00210137d79122f9c45e07f8e41d6109990;p=lilypond.git

Fix FTBFS when built with dpkg-buildpackage -A

Previously, "$(MAKE) install" was not run for arch-independent build,
hence dh_install was unable to find the non-documentation files that are
destined for lilypond-data.

Thanks to Santiago Vila for the bug report. (Closes: #806067)
---

diff --git a/debian/rules b/debian/rules
index 5e78bbb37a..f567568063 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,18 +40,9 @@ override_dh_auto_configure:
 	dh_auto_configure -- --disable-checking --enable-debugging --enable-guile2 $(config_opt)
 
 override_dh_auto_build-indep:
-	dh_auto_build
+	dh_auto_build -i -O--parallel
 	$(MAKE) doc $(DOC_OPTIONS)
 
-override_dh_auto_install-indep:
-	$(MAKE) install-doc $(DOC_OPTIONS) prefix=$(CURDIR)/debian/tmp/usr/
-	$(MAKE) install-info $(DOC_OPTIONS) prefix=$(CURDIR)/debian/tmp/usr
-	rm -rf $(CURDIR)/debian/tmp/usr/share/omf
-	rm -rf $(CURDIR)/debian/tmp/usr/share/doc/lilypond/html/input
-	perl debian/move_info_images_from_html_doc $(CURDIR)/debian/tmp/usr/share/info/ $(CURDIR)/debian/tmp/usr/share/doc/lilypond/html/Documentation/
-	perl debian/symlink_html_images_to_info_images $(CURDIR)/debian/tmp/usr/share/info/lilypond
-	perl debian/remove_w3c_callback $(CURDIR)/debian/tmp/usr/share/doc/lilypond/ $(CURDIR)/debian/tmp/usr/share/info/
-
 ## Unfortunately, lilypond is kind of broken, and installs the wrong
 ## info documentation (missing images) if we call their makefile
 ## directly. They also don't provide an install rule which doesn't
@@ -62,18 +53,33 @@ override_dh_auto_install-arch:
 		$(MAKE) --no-builtin-rules PACKAGE=LILYPOND package=lilypond -C $$dir install $(DOC_OPTIONS) prefix=$(CURDIR)/debian/tmp/usr/; \
 	done
 
+## We need the non-Documentation arch-independent files installed by
+## the arch-dependent "$(MAKE) install" too, hence the dependency
+## on override_dh_auto_install-arch
+override_dh_auto_install-indep: override_dh_auto_install-arch
+	$(MAKE) install-doc $(DOC_OPTIONS) prefix=$(CURDIR)/debian/tmp/usr/
+	$(MAKE) install-info $(DOC_OPTIONS) prefix=$(CURDIR)/debian/tmp/usr
+	rm -rf $(CURDIR)/debian/tmp/usr/share/omf
+	rm -rf $(CURDIR)/debian/tmp/usr/share/doc/lilypond/html/input
+	perl debian/move_info_images_from_html_doc $(CURDIR)/debian/tmp/usr/share/info/ $(CURDIR)/debian/tmp/usr/share/doc/lilypond/html/Documentation/
+	perl debian/symlink_html_images_to_info_images $(CURDIR)/debian/tmp/usr/share/info/lilypond
+	perl debian/remove_w3c_callback $(CURDIR)/debian/tmp/usr/share/doc/lilypond/ $(CURDIR)/debian/tmp/usr/share/info/
+
 ## we need to nuke the parser files, because if there is a mismatch
 ## between upstreams bison and our bison, the build will fail epically
 override_dh_auto_clean:
 	rm -f lily/out/parser.*
 	dh_auto_clean --no-parallel
 
+override_dh_install-arch:
+	dh_install -a -O--parallel --list-missing
+
 ## we need to install only the png, jpg, css, ly and english html
 ## files into the doc-html package, and only the english pdfs into the
 ## doc-pdf package. Because dh_install doesn't support regexes, we'll
 ## use find to replace the contents of the .install file before we
 ## call dh_install
-override_dh_install:
+override_dh_install-indep:
 	/bin/echo -e 'usr/share/doc/lilypond/html/*/*/*.ly\nusr/share/doc/lilypond/html/*/*/*.png' \
 		> $(CURDIR)/debian/lilypond-doc-html.install
 	/bin/echo -e 'usr/share/doc/lilypond/html/*/*/*.jpg\nusr/share/doc/lilypond/html/*/*/*.css' \
@@ -88,7 +94,7 @@ override_dh_install:
 	find $(CURDIR)/debian/tmp/ -type f \
 		-regex '.*usr/share/doc/lilypond/.*/[^\.]+.preview.pdf' \
 		-printf '%P\n' >> $(CURDIR)/debian/lilypond-doc-pdf.install
-	dh_install --list-missing
+	dh_install -i -O--parallel --list-missing
 
 override_dh_python2:
 	dh_python2 --verbose