UBUNTU: [Config] Simplify binary-udebs dependencies

binary-udebs are always dependent on binary-debs.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index 466c8a4..c58a426 100644 (file)
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -409,9 +409,10 @@ binary-debs: binary-perarch $(stampdir)/stamp-flavours $(addprefix binary-,$(fla
 build-arch-deps-$(do_flavour_image_package) += $(addprefix build-,$(flavours))
 build-arch: $(build-arch-deps-true)
 
-binary-arch-deps-$(do_flavour_image_package) = binary-debs
 ifeq ($(AUTOBUILD),)
 binary-arch-deps-$(do_flavour_image_package) += binary-udebs
+else
+binary-arch-deps-$(do_flavour_image_package) = binary-debs
 endif
 binary-arch-deps-$(do_libc_dev_package) += binary-arch-headers
 ifneq ($(do_common_headers_indep),true)

diff --git a/debian/rules.d/5-udebs.mk b/debian/rules.d/5-udebs.mk
index 24fbadf..63583de 100644 (file)
--- a/debian/rules.d/5-udebs.mk
+++ b/debian/rules.d/5-udebs.mk
@@ -1,11 +1,11 @@
 # Do udebs if not disabled in the arch-specific makefile
-binary-udebs: binary-debs debian/control
+binary-udebs: binary-debs
 ifeq ($(disable_d_i),)
        @$(MAKE) --no-print-directory -f $(DROOT)/rules DEBIAN=$(DEBIAN) \
                do-binary-udebs
 endif
 
-do-binary-udebs:
+do-binary-udebs: debian/control
        dh_testdir
        dh_testroot