Patchwork [2/3] UBUNTU: source package -- cleanup source content control

login
register
mail settings
Submitter Andy Whitcroft
Date March 3, 2010, 3:06 p.m.
Message ID <1267628776-4452-3-git-send-email-apw@canonical.com>
Download mbox | patch
Permalink /patch/46816/
State Accepted
Delegated to: Andy Whitcroft
Headers show

Comments

Andy Whitcroft - March 3, 2010, 3:06 p.m.
Rename do_linux_source_content to match other switches.  Switch
initialisation to match similar variables.

Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
 debian/rules.d/0-common-vars.mk  |    6 +++---
 debian/rules.d/1-maintainer.mk   |    2 +-
 debian/rules.d/3-binary-indep.mk |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

Patch

diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk
index 6fe45a7..bf3f4c4 100644
--- a/debian/rules.d/0-common-vars.mk
+++ b/debian/rules.d/0-common-vars.mk
@@ -104,9 +104,9 @@  doc_pkg_name=$(src_pkg_name)-doc
 # somewhat I/O intensive and utterly useless.
 #
 do_source_package=true
-do_linux_source_content=false
-ifneq ($(wildcard /CurrentlyBuilding),)
-do_linux_source_content=true
+do_source_package_content=true
+ifeq ($(wildcard /CurrentlyBuilding),)
+do_source_package_content=false
 endif
 
 # linux-libc-dev may not be needed, default to building it.
diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk
index 7fdabe8..ff25d1d 100644
--- a/debian/rules.d/1-maintainer.mk
+++ b/debian/rules.d/1-maintainer.mk
@@ -95,7 +95,7 @@  endif
 	@echo "do_doc_package            = $(do_doc_package)"
 	@echo "do_doc_package_content    = $(do_doc_package_content)"
 	@echo "do_source_package         = $(do_source_package)"
-	@echo "do_linux_source_content   = $(do_linux_source_content)"
+	@echo "do_source_package_content = $(do_source_package_content)"
 	@echo "do_libc_dev_package       = $(do_libc_dev_package)"
 	@echo "do_common_headers_indep   = $(do_common_headers_indep)"
 	@echo "do_full_source            = $(do_full_source)"
diff --git a/debian/rules.d/3-binary-indep.mk b/debian/rules.d/3-binary-indep.mk
index 4b9fb70..094c7c5 100644
--- a/debian/rules.d/3-binary-indep.mk
+++ b/debian/rules.d/3-binary-indep.mk
@@ -53,7 +53,7 @@  install-source:
 	dh_clean -k -p$(srcpkg)
 
 	install -d $(srcdir)
-ifeq ($(do_linux_source_content),true)
+ifeq ($(do_source_package_content),true)
 	find . -path './debian' -prune -o -path './$(DEBIAN)' -prune -o \
 		-path './.*' -prune -o -print | \
 		cpio -pd --preserve-modification-time $(srcdir)