From 4fb3f714758bc61e32689e082ced3457b4fe9ffc Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Tue, 1 Aug 2017 16:43:42 +0100 Subject: [PATCH] system-helper: Ensure template files are always distributed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously they weren’t getting distributed unless the system helper was enabled at configure time for distcheck. They should be distributed unconditionally so the user can choose whether to enable the system helper when they call configure. Signed-off-by: Philip Withnall --- system-helper/Makefile.am.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/system-helper/Makefile.am.inc b/system-helper/Makefile.am.inc index 37c042bb..c4749869 100644 --- a/system-helper/Makefile.am.inc +++ b/system-helper/Makefile.am.inc @@ -9,7 +9,7 @@ service_in_files += system-helper/org.freedesktop.Flatpak.SystemHelper.service.i dbussystemservice_DATA = system-helper/org.freedesktop.Flatpak.SystemHelper.service dbusconfdir = $(DBUS_CONFIG_DIR) -dbusconf_DATA = system-helper/org.freedesktop.Flatpak.SystemHelper.conf +dist_dbusconf_DATA = system-helper/org.freedesktop.Flatpak.SystemHelper.conf service_in_files += system-helper/flatpak-system-helper.service.in systemdsystemunit_DATA = system-helper/flatpak-system-helper.service @@ -36,7 +36,8 @@ polkit_policy_DATA = \ %.policy: %.policy.in $(AM_V_GEN) $(MSGFMT) --xml -d $(top_srcdir)/po --template $< -o $@ || cp $< $@ -EXTRA_DIST += system-helper/org.freedesktop.Flatpak.policy.in system-helper/org.freedesktop.Flatpak.SystemHelper.conf system-helper/org.freedesktop.Flatpak.rules.in DISTCLEANFILES += system-helper/org.freedesktop.Flatpak.policy system-helper/org.freedesktop.Flatpak.rules system-helper/flatpak-system-helper.service system-helper/org.freedesktop.Flatpak.SystemHelper.service endif + +EXTRA_DIST += system-helper/org.freedesktop.Flatpak.policy.in system-helper/org.freedesktop.Flatpak.SystemHelper.conf system-helper/org.freedesktop.Flatpak.rules.in system-helper/org.freedesktop.Flatpak.SystemHelper.service.in system-helper/flatpak-system-helper.service.in