UBUNTU: [Packaging] limit preparation to linux-libc-dev in headers

BugLink: http://bugs.launchpad.net/bugs/1806380
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Seth Forshee <seth.forshee@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

diff --git a/debian/rules.d/3-binary-indep.mk b/debian/rules.d/3-binary-indep.mk
index 0704d28d6a4802506b8c2251006b2775fef1a083..b27275685612d6b77a617c6d234c8359051aa03a 100644 (file)
--- a/debian/rules.d/3-binary-indep.mk
+++ b/debian/rules.d/3-binary-indep.mk
@@ -8,11 +8,10 @@ build-indep:
 #
 indep_hdrpkg = $(indep_hdrs_pkg_name)
 indep_hdrdir = $(CURDIR)/debian/$(indep_hdrpkg)/usr/src/$(indep_hdrpkg)
-install-headers:
+install-headers: prepare-indep
        @echo Debug: $@
        dh_testdir
        dh_testroot
-       dh_prep
 
 ifeq ($(do_flavour_header_package),true)
        install -d $(indep_hdrdir)
@@ -30,7 +29,7 @@ endif
 
 docpkg = $(doc_pkg_name)
 docdir = $(CURDIR)/debian/$(docpkg)/usr/share/doc/$(docpkg)
-install-doc: install-headers
+install-doc: prepare-indep
        @echo Debug: $@
 ifeq ($(do_doc_package),true)
        dh_testdir
@@ -56,7 +55,7 @@ endif
 srcpkg = linux-source-$(release)
 srcdir = $(CURDIR)/debian/$(srcpkg)/usr/src/$(srcpkg)
 balldir = $(CURDIR)/debian/$(srcpkg)/usr/src/$(srcpkg)/$(srcpkg)
-install-source: install-doc
+install-source: prepare-indep
        @echo Debug: $@
 ifeq ($(do_source_package),true)
 
@@ -92,7 +91,7 @@ install-tools: cloudpkg = $(cloud_common_pkg_name)
 install-tools: cloudbin = $(CURDIR)/debian/$(cloudpkg)/usr/bin
 install-tools: cloudsbin = $(CURDIR)/debian/$(cloudpkg)/usr/sbin
 install-tools: cloudman = $(CURDIR)/debian/$(cloudpkg)/usr/share/man
-install-tools: install-source $(stampdir)/stamp-build-perarch
+install-tools: prepare-indep $(stampdir)/stamp-build-perarch
        @echo Debug: $@
 
 ifeq ($(do_tools_common),true)
@@ -158,12 +157,16 @@ ifeq ($(do_tools_host),true)
                $(hosttoolsman)/man1
 endif
 
-install-indep: install-tools
+prepare-indep:
+       @echo Debug: $@
+       dh_prep -i
+
+install-indep: install-headers install-doc install-source install-tools
        @echo Debug: $@
 
 # This is just to make it easy to call manually. Normally done in
 # binary-indep target during builds.
-binary-headers: install-headers
+binary-headers: prepare-indep install-headers
        @echo Debug: $@
        dh_installchangelogs -p$(indep_hdrpkg)
        dh_installdocs -p$(indep_hdrpkg)
@@ -177,7 +180,6 @@ binary-headers: install-headers
 binary-indep: cloudpkg = $(cloud_common_pkg_name)
 binary-indep: install-indep
        @echo Debug: $@
-
        dh_installchangelogs -i
        dh_installdocs -i
        dh_compress -i