• Bug#872381: dpkg-dev: optimize Makefile snippets for debian/rules (2/6)

    From Nicolas Boulenguez@1:229/2 to All on Mon Mar 4 16:50:01 2024
    [continued from previous message]

    SOURCE_DATE_EPOCH ?= $(call dpkg_late_eval,SOURCE_DATE_EPOCH,dpkg-parsechangelog -STimestamp)

    export SOURCE_DATE_EPOCH
    +
    +endif
    diff --git a/scripts/mk/vendor.mk b/scripts/mk/vendor.mk
    index f3241a57b..36e452f49 100644
    --- a/scripts/mk/vendor.mk
    +++ b/scripts/mk/vendor.mk
    @@ -33,6 +33,9 @@
    # ...
    # endif

    +ifndef dpkg_vendor.mk_included
    +dpkg_vendor.mk_included :=
    +
    dpkg_datadir = $(srcdir)/mk
    include $(dpkg_datadir)/buildapi.mk

    @@ -49,3 +52,5 @@ dpkg_vendor_derives_from ?= $(dpkg_vendor_derives_from_v1)
    else
    dpkg_vendor_derives_from ?= $(dpkg_vendor_derives_from_v0)
    endif
    +
    +endif
    --
    2.39.2


    From 159a6d6f0be9c0f1879faf28eae07f2d0832a10e Mon Sep 17 00:00:00 2001
    From: Nicolas Boulenguez <nicolas@debian.org>
    Date: Mon, 4 Mar 2024 11:58:53 +0100
    Subject: [PATCH 02/10] scripts/mk: stop hard-coding dpkg_datadir

    This path differ during tests and after installation. Instead of
    rewriting the file with a hardcoded path, compute it within Make.

    When setting dpkg_datadir, prefer 'ifndef' and ':=' to '?=', so that
    the value is computed at most once.
    ---
    build-aux/subst.am | 6 ------
    scripts/mk/Makefile.am | 21 ---------------------
    scripts/mk/buildtools.mk | 4 +++-
    scr