1. Forum
  2. Usenet
  3. LINUX.DEBIAN.MAINT.DPKG

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

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

    index 5515930d0..167a71257 100644
    --- a/build-aux/subst.am
    +++ b/build-aux/subst.am
    @@ -39,9 +39,3 @@ SUFFIXES += .pl
    @test -d `dirname $@` || $(MKDIR_P) `dirname $@`
    $(do_perl_subst) <$< >$@
    $(AM_V_at) chmod +x $@
    -
    -# Makefile support.
    -
    -do_make_subst = $(AM_V_GEN) $(SED) \
    - -e "s:dpkg_datadir[[:space:]]*=[[:space:]]*[^[:space:]]*:dpkg_datadir = $(pkgdatadir):" \
    - # EOL
    diff --git a/scripts/mk/Makefile.am b/scripts/mk/Makefile.am
    index 257ba5252..6e85e17b9 100644
    --- a/scripts/mk/Makefile.am
    +++ b/scripts/mk/Makefile.am
    @@ -10,24 +10,3 @@ dist_pkgdata_DATA = \
    pkg-info.mk \
    vendor.mk \
    # EOL
    -
    -SUFFIXES =
    -
    -include $(top_srcdir)/build-aux/subst.am
    -
    -# Ideally we'd use '$(SED) -i', but unfortunately that's not portable. -install-data-hook:
    - $(do_make_subst) <$(DESTDIR)$(pkgdatadir)/default.mk \
    - >$(DESTDIR)$(pkgdatadir)/default.mk.new
    - mv $(DESTDIR)$(pkgdatadir)/default.mk.new \
    - $(DESTDIR)$(pkgdatadir)/default.mk
    -
    - $(do_make_subst) <$(DESTDIR)$(pkgdatadir)/buildtools