hostnamed, localed: move config files to subdir
This commit is contained in:
parent
00c36f274b
commit
681cfc6c40
64
Makefile.am
64
Makefile.am
|
@ -249,29 +249,9 @@ dist_pkgsysconf_DATA = \
|
||||||
dist_dbuspolicy_DATA = \
|
dist_dbuspolicy_DATA = \
|
||||||
src/org.freedesktop.systemd1.conf
|
src/org.freedesktop.systemd1.conf
|
||||||
|
|
||||||
if ENABLE_HOSTNAMED
|
|
||||||
dist_dbuspolicy_DATA += \
|
|
||||||
src/org.freedesktop.hostname1.conf
|
|
||||||
endif
|
|
||||||
|
|
||||||
if ENABLE_LOCALED
|
|
||||||
dist_dbuspolicy_DATA += \
|
|
||||||
src/org.freedesktop.locale1.conf
|
|
||||||
endif
|
|
||||||
|
|
||||||
dist_dbussystemservice_DATA = \
|
dist_dbussystemservice_DATA = \
|
||||||
src/org.freedesktop.systemd1.service
|
src/org.freedesktop.systemd1.service
|
||||||
|
|
||||||
if ENABLE_HOSTNAMED
|
|
||||||
dist_dbussystemservice_DATA += \
|
|
||||||
src/org.freedesktop.hostname1.service
|
|
||||||
endif
|
|
||||||
|
|
||||||
if ENABLE_LOCALED
|
|
||||||
dist_dbussystemservice_DATA += \
|
|
||||||
src/org.freedesktop.locale1.service
|
|
||||||
endif
|
|
||||||
|
|
||||||
dist_udevrules_DATA = \
|
dist_udevrules_DATA = \
|
||||||
src/71-seat.rules
|
src/71-seat.rules
|
||||||
|
|
||||||
|
@ -294,16 +274,6 @@ dbusinterface_DATA = \
|
||||||
org.freedesktop.systemd1.Swap.xml \
|
org.freedesktop.systemd1.Swap.xml \
|
||||||
org.freedesktop.systemd1.Path.xml
|
org.freedesktop.systemd1.Path.xml
|
||||||
|
|
||||||
if ENABLE_HOSTNAMED
|
|
||||||
dbusinterface_DATA += \
|
|
||||||
org.freedesktop.hostname1.xml
|
|
||||||
endif
|
|
||||||
|
|
||||||
if ENABLE_LOCALED
|
|
||||||
dbusinterface_DATA += \
|
|
||||||
org.freedesktop.locale1.xml
|
|
||||||
endif
|
|
||||||
|
|
||||||
dist_bashcompletion_DATA = \
|
dist_bashcompletion_DATA = \
|
||||||
src/systemd-bash-completion.sh
|
src/systemd-bash-completion.sh
|
||||||
|
|
||||||
|
@ -558,16 +528,6 @@ pkgconfiglib_DATA = \
|
||||||
libsystemd-id128.pc \
|
libsystemd-id128.pc \
|
||||||
libsystemd-journal.pc
|
libsystemd-journal.pc
|
||||||
|
|
||||||
if ENABLE_HOSTNAMED
|
|
||||||
polkitpolicy_in_files += \
|
|
||||||
src/org.freedesktop.hostname1.policy.in
|
|
||||||
endif
|
|
||||||
|
|
||||||
if ENABLE_LOCALED
|
|
||||||
polkitpolicy_in_files += \
|
|
||||||
src/org.freedesktop.locale1.policy.in
|
|
||||||
endif
|
|
||||||
|
|
||||||
# First passed through sed, followed by intltool
|
# First passed through sed, followed by intltool
|
||||||
polkitpolicy_in_in_files = \
|
polkitpolicy_in_in_files = \
|
||||||
src/org.freedesktop.systemd1.policy.in.in
|
src/org.freedesktop.systemd1.policy.in.in
|
||||||
|
@ -1107,6 +1067,18 @@ rootlibexec_PROGRAMS += \
|
||||||
nodist_systemunit_DATA += \
|
nodist_systemunit_DATA += \
|
||||||
units/systemd-hostnamed.service
|
units/systemd-hostnamed.service
|
||||||
|
|
||||||
|
dist_dbuspolicy_DATA += \
|
||||||
|
src/hostname/org.freedesktop.hostname1.conf
|
||||||
|
|
||||||
|
dist_dbussystemservice_DATA += \
|
||||||
|
src/hostname/org.freedesktop.hostname1.service
|
||||||
|
|
||||||
|
polkitpolicy_in_files += \
|
||||||
|
src/hostname/org.freedesktop.hostname1.policy.in
|
||||||
|
|
||||||
|
dbusinterface_DATA += \
|
||||||
|
org.freedesktop.hostname1.xml
|
||||||
|
|
||||||
org.freedesktop.hostname1.xml: systemd-hostnamed
|
org.freedesktop.hostname1.xml: systemd-hostnamed
|
||||||
$(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.hostname1 $< $@.tmp && \
|
$(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.hostname1 $< $@.tmp && \
|
||||||
$(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
|
$(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
|
||||||
|
@ -1146,6 +1118,18 @@ nodist_systemunit_DATA += \
|
||||||
rootlibexec_PROGRAMS += \
|
rootlibexec_PROGRAMS += \
|
||||||
systemd-localed
|
systemd-localed
|
||||||
|
|
||||||
|
dist_dbuspolicy_DATA += \
|
||||||
|
src/locale/org.freedesktop.locale1.conf
|
||||||
|
|
||||||
|
dist_dbussystemservice_DATA += \
|
||||||
|
src/locale/org.freedesktop.locale1.service
|
||||||
|
|
||||||
|
polkitpolicy_in_files += \
|
||||||
|
src/locale/org.freedesktop.locale1.policy.in
|
||||||
|
|
||||||
|
dbusinterface_DATA += \
|
||||||
|
org.freedesktop.locale1.xml
|
||||||
|
|
||||||
org.freedesktop.locale1.xml: systemd-localed
|
org.freedesktop.locale1.xml: systemd-localed
|
||||||
$(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.locale1 $< $@.tmp && \
|
$(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.locale1 $< $@.tmp && \
|
||||||
$(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
|
$(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
src/org.freedesktop.hostname1.policy.in
|
src/hostname/org.freedesktop.hostname1.policy.in
|
||||||
src/org.freedesktop.locale1.policy.in
|
src/locale/org.freedesktop.locale1.policy.in
|
||||||
src/login/org.freedesktop.login1.policy.in
|
src/login/org.freedesktop.login1.policy.in
|
||||||
src/timedate/org.freedesktop.timedate1.policy.in
|
src/timedate/org.freedesktop.timedate1.policy.in
|
||||||
|
|
Loading…
Reference in a new issue