override the document; fix the doc-base-special install

diff --git a/debian/rules b/debian/rules
index 20c134bb5aa3acfd883e4079ea4967128234eecd..fa4981a5ed2e5dca8c0e1020c8290dda36eedd01 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,7 @@ endif
 
 DOC_OPTIONS := WEB_TARGETS="offline"
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-       DOC_OPTIONS := $(DOC_OPTIONS) $(DEB_BUILD_OPTIONS) CPU_COUNT=$(firstword $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))))
+       DOC_OPTIONS := $(DOC_OPTIONS) CPU_COUNT=$(firstword $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))))
 endif
 
 %:
@@ -36,13 +36,25 @@ override_dh_auto_configure:
 
 override_dh_auto_build-indep:
        dh_auto_build
-       $(MAKE) $(DOC_OPTIONS) doc
+       $(MAKE) doc $(DOC_OPTIONS)
 
 override_dh_auto_install-indep:
-       $(MAKE) install-doc prefix=$(CURDIR)/debian/tmp/usr/
+       $(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
 
+## 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
+## install the documentation, which we don't care about for the
+## architecture dependent build
+override_dh_auto_install-arch:
+       for dir in `echo */*makefile|xargs -n 1 dirname|grep -v Documentation`; do \
+               $(MAKE) --no-builtin-rules PACKAGE=LILYPOND package=lilypond -C $$dir install $(DOC_OPTIONS) prefix=$(CURDIR)/debian/tmp/usr/; \
+       done;
+
+
 ## 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
@@ -75,9 +87,9 @@ override_dh_compress:
 override_dh_installdocs:
        dh_installdocs
        for a in $(wildcard $(CURDIR)/debian/*.doc-base-special); do \
-               package=$$(basename $$a .doc-base-special); \
-               install -d debian/$$package/usr/share/doc-base \
-               install $$a debian/$$package/usr/share/doc-base/$$package; \
+               package=`basename $$a .doc-base-special`; \
+               install -d debian/$$package/usr/share/doc-base; \
+               install -m0644 $$a debian/$$package/usr/share/doc-base/$$package; \
        done;
 
 ## this rule will update debian/control and the per-language install