This is an automated email from the git hooks/post-receive script.

guillem pushed a commit to branch main
in repository dpkg.

View the commit online:
https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=b6b89baa413fe9f37c5df5fbe1bba4f5f7f758b1

commit b6b89baa413fe9f37c5df5fbe1bba4f5f7f758b1
Author: Guillem Jover <guil...@debian.org>
AuthorDate: Tue Sep 13 23:41:55 2022 +0200

    scripts/mk: On dpkg-build-api >= 1 include buildtools.mk in default.mk
---
 man/dpkg-build-api.pod | 4 ++++
 scripts/mk/default.mk  | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/man/dpkg-build-api.pod b/man/dpkg-build-api.pod
index d8eb0c1d5..e5cd3d722 100644
--- a/man/dpkg-build-api.pod
+++ b/man/dpkg-build-api.pod
@@ -75,6 +75,10 @@ B<dpkg_vendor_derives_from> macro.
 To restore the B<v0> behavior set B<dpkg_vendor_derives_from> to
 B<dpkg_vendor_derives_from_v0>.
 
+=item *
+
+B<default.mk> defaults to including B<buildtools.mk>.
+
 =back
 
 =item v0
diff --git a/scripts/mk/default.mk b/scripts/mk/default.mk
index ad2ef5de3..0b2fd4aca 100644
--- a/scripts/mk/default.mk
+++ b/scripts/mk/default.mk
@@ -4,6 +4,9 @@
 dpkg_datadir = $(srcdir)/mk
 include $(dpkg_datadir)/architecture.mk
 include $(dpkg_datadir)/buildapi.mk
+ifeq ($(call dpkg_build_api_ge,1),yes)
+include $(dpkg_datadir)/buildtools.mk
+endif
 include $(dpkg_datadir)/buildflags.mk
 include $(dpkg_datadir)/buildopts.mk
 include $(dpkg_datadir)/pkg-info.mk

-- 
Dpkg.Org's dpkg

Reply via email to