mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-01-27 00:59:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

system-helper: Ensure template files are always distributed

Browse Source 
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 <withnall@endlessm.com>
This commit is contained in:
Philip Withnall
2017-08-01 16:43:42 +01:00
parent ea0fc59119
commit 4fb3f71475
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
system-helper/Makefile.am.inc
View File

@@ -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