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=50f46e6bed37bf82cd1485c189e62849c1f85ff4 commit 50f46e6bed37bf82cd1485c189e62849c1f85ff4 Author: Guillem Jover <[email protected]> AuthorDate: Sun Jan 28 23:02:55 2024 +0100 build: Move u-a rules within automake conditional This follows the same pattern as the s-s-d build rules. --- utils/Makefile.am | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/utils/Makefile.am b/utils/Makefile.am index 433ee2490..f60d6b9ec 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -20,6 +20,22 @@ CLEANFILES = if BUILD_UPDATE_ALTERNATIVES bin_PROGRAMS += update-alternatives +update_alternatives_CPPFLAGS = \ + -DALT_TMP_EXT=\".dpkg-tmp\" \ + -DADMINDIR_ENVVAR=\"DPKG_ADMINDIR\" \ + -DINSTDIR_ENVVAR=\"DPKG_ROOT\" \ + $(AM_CPPFLAGS) \ + # EOL + +update_alternatives_SOURCES = \ + update-alternatives.c \ + # EOL + +update_alternatives_LDADD = \ + ../lib/compat/libcompat.la \ + $(LIBINTL) \ + # EOL + polkitactions_DATA += org.dpkg.pkexec.update-alternatives.policy endif @@ -33,22 +49,6 @@ org.dpkg.pkexec.update-alternatives.policy: update-alternatives.polkit.in Makefi $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o - \ | $(do_polkit_subst) >$@ -update_alternatives_SOURCES = \ - update-alternatives.c \ - # EOL - -update_alternatives_CPPFLAGS = \ - -DALT_TMP_EXT=\".dpkg-tmp\" \ - -DADMINDIR_ENVVAR=\"DPKG_ADMINDIR\" \ - -DINSTDIR_ENVVAR=\"DPKG_ROOT\" \ - $(AM_CPPFLAGS) \ - # EOL - -update_alternatives_LDADD = \ - ../lib/compat/libcompat.la \ - $(LIBINTL) \ - # EOL - EXTRA_DIST += \ README.alternatives \ update-alternatives.polkit.in \ -- Dpkg.Org's dpkg
