From 6f4940e2e09310d2f841f945f8d62ab08df2cc1e Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Sun, 5 Nov 2023 16:00:31 +0100 Subject: [PATCH] Only include all dpkg default.mk in rules.real --- debian/rules | 2 ++ debian/rules.defs | 3 --- debian/rules.real | 4 +++- debian/signing_templates/rules | 4 +++- debian/signing_templates/rules.real | 2 ++ 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/debian/rules b/debian/rules index c11dc00104..248dc7570f 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,7 @@ #!/usr/bin/make -f +include /usr/share/dpkg/architecture.mk + SHELL := sh -e SOURCE := $(shell dpkg-parsechangelog -SSource) VERSION := $(shell dpkg-parsechangelog -SVersion) diff --git a/debian/rules.defs b/debian/rules.defs index 9384a9b3e4..e720ef3a1a 100644 --- a/debian/rules.defs +++ b/debian/rules.defs @@ -1,5 +1,2 @@ -include /usr/share/dpkg/default.mk - BUILD_DIR = debian/build STAMPS_DIR = debian/stamps - diff --git a/debian/rules.real b/debian/rules.real index 483e3d5934..240a5662b8 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -5,6 +5,9 @@ # Additionally, variables version, abiname and ltver are # expected to be available (need to be exported from the parent process). # + +include /usr/share/dpkg/default.mk + SHELL := bash -e MAINTAINER := $(shell sed -ne 's,^Maintainer: .[^<]*<\([^>]*\)>,\1,p' debian/control) DISTRIBUTION := $(shell dpkg-parsechangelog -SDistribution) @@ -17,7 +20,6 @@ DISTRIBUTOR := Debian endif include debian/rules.defs -include /usr/share/dpkg/pkg-info.mk ifdef ARCH ifneq ($(DEB_HOST_ARCH),$(ARCH)) diff --git a/debian/signing_templates/rules b/debian/signing_templates/rules index ad6156b872..18d3d7d247 100755 --- a/debian/signing_templates/rules +++ b/debian/signing_templates/rules @@ -1,8 +1,10 @@ #!/usr/bin/make -f -SHELL := sh -e include /usr/share/dpkg/architecture.mk +SHELL := sh -e + + build: build-arch build-indep build-arch: build-indep: diff --git a/debian/signing_templates/rules.real b/debian/signing_templates/rules.real index dfc84ebbe7..05f1421dc2 100644 --- a/debian/signing_templates/rules.real +++ b/debian/signing_templates/rules.real @@ -1,3 +1,5 @@ +include /usr/share/dpkg/default.mk + SHELL := bash -e export DH_OPTIONS