From 1438d4ba7af3804451f2ae6abaad3ec0537b3484 Mon Sep 17 00:00:00 2001 From: "Dr. Tobias Quathamer" Date: Tue, 3 Oct 2017 14:39:53 +0200 Subject: [PATCH] Include subsequent fixes to d/rules from branch debian --- debian/rules | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/debian/rules b/debian/rules index fbd12f8f84..7b32fc2e9a 100755 --- a/debian/rules +++ b/debian/rules @@ -35,9 +35,6 @@ endif # START: Definitions from the old guile-1.8 (1.8.8+1-10) package ######################################################################## -# Make sure the build process doesn't touch the real HOME. -export HOME := $(CURDIR)/no-trespassing - # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -103,22 +100,13 @@ override_dh_auto_configure: $(MAKE) -C guile18 install DESTDIR=$(CURDIR)/out/guile rm -f lily/out/parser.* ./autogen.sh --noconfigure - GUILE_LOAD_PATH=$(GUILE_LOAD_PATH) \ + GUILE_LOAD_PATH="$(GUILE_LOAD_PATH)" \ dh_auto_configure -- --disable-checking --enable-debugging $(config_opt) override_dh_auto_build-indep: dh_auto_build -i -O--parallel $(MAKE) doc $(DOC_OPTIONS) -override_dh_auto_install-indep: debian/guile.reloc - $(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 @@ -134,7 +122,7 @@ override_dh_auto_install-arch: debian/lilypond.sh debian/lilypond-invoke-editor. ## 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 +override_dh_auto_install-indep: override_dh_auto_install-arch debian/guile.reloc $(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 @@ -146,8 +134,7 @@ override_dh_auto_install-indep: override_dh_auto_install-arch ## 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 -rf no-trespassing - -$(MAKE) -C guile18 maintainer-clean + [ ! -f guile18/Makefile ] || $(MAKE) -C guile18 maintainer-clean rm -f lily/out/parser.* dh_auto_clean --no-parallel @@ -191,12 +178,16 @@ override_dh_installdocs: install -m0644 $$a debian/$$package/usr/share/doc-base/$$package; \ done -override_dh_shlibdeps: +override_dh_shlibdeps-arch: $(eval unexport LD_LIBRARY_PATH) - dh_shlibdeps -lusr/lib/$(DEB_HOST_MULTIARCH)/lilypond/$(LILYPOND_VERSION)/guile + dh_shlibdeps -a -O--parallel -lusr/lib/$(DEB_HOST_MULTIARCH)/lilypond/$(LILYPOND_VERSION)/guile + +# Skip tests for architecture-dependent-only build because +# the test would fail without built documentation. +override_dh_auto_test-arch: -override_dh_auto_test: -ifneq (,$(filter $(DEB_BUILD_OPTIONS),nocheck)) +override_dh_auto_test-indep: +ifeq (,$(filter $(DEB_BUILD_OPTIONS),nocheck)) $(MAKE) test-baseline $(MAKE) test endif -- 2.39.2