diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2011-12-31 07:21:37 +0100 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2011-12-31 07:23:57 +0100 |
| commit | 681cfc6c40b176f73204c9088bfc5a7e8bad4317 (patch) | |
| tree | 2dc3ec984cdd45af3901aa2689b69e2e0e5de2fb | |
| parent | hostnamed: move sources to subdirectory (diff) | |
| download | systemd-681cfc6c40b176f73204c9088bfc5a7e8bad4317.tar.xz systemd-681cfc6c40b176f73204c9088bfc5a7e8bad4317.zip | |
hostnamed, localed: move config files to subdir
| -rw-r--r-- | Makefile.am | 64 | ||||
| -rw-r--r-- | po/POTFILES.in | 4 | ||||
| -rw-r--r-- | src/hostname/org.freedesktop.hostname1.conf (renamed from src/org.freedesktop.hostname1.conf) | 0 | ||||
| -rw-r--r-- | src/hostname/org.freedesktop.hostname1.policy.in (renamed from src/org.freedesktop.hostname1.policy.in) | 0 | ||||
| -rw-r--r-- | src/hostname/org.freedesktop.hostname1.service (renamed from src/org.freedesktop.hostname1.service) | 0 | ||||
| -rw-r--r-- | src/locale/org.freedesktop.locale1.conf (renamed from src/org.freedesktop.locale1.conf) | 0 | ||||
| -rw-r--r-- | src/locale/org.freedesktop.locale1.policy.in (renamed from src/org.freedesktop.locale1.policy.in) | 0 | ||||
| -rw-r--r-- | src/locale/org.freedesktop.locale1.service (renamed from src/org.freedesktop.locale1.service) | 0 |
8 files changed, 26 insertions, 42 deletions
diff --git a/Makefile.am b/Makefile.am index c6a25a78e1..299b9e5e68 100644 --- a/Makefile.am +++ b/Makefile.am @@ -249,29 +249,9 @@ dist_pkgsysconf_DATA = \ dist_dbuspolicy_DATA = \ 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 = \ 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 = \ src/71-seat.rules @@ -294,16 +274,6 @@ dbusinterface_DATA = \ org.freedesktop.systemd1.Swap.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 = \ src/systemd-bash-completion.sh @@ -558,16 +528,6 @@ pkgconfiglib_DATA = \ libsystemd-id128.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 polkitpolicy_in_in_files = \ src/org.freedesktop.systemd1.policy.in.in @@ -1107,6 +1067,18 @@ rootlibexec_PROGRAMS += \ nodist_systemunit_DATA += \ 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 $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.hostname1 $< $@.tmp && \ $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \ @@ -1146,6 +1118,18 @@ nodist_systemunit_DATA += \ rootlibexec_PROGRAMS += \ 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 $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.locale1 $< $@.tmp && \ $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \ diff --git a/po/POTFILES.in b/po/POTFILES.in index 1a9090348a..ed2c308db8 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,4 +1,4 @@ -src/org.freedesktop.hostname1.policy.in -src/org.freedesktop.locale1.policy.in +src/hostname/org.freedesktop.hostname1.policy.in +src/locale/org.freedesktop.locale1.policy.in src/login/org.freedesktop.login1.policy.in src/timedate/org.freedesktop.timedate1.policy.in diff --git a/src/org.freedesktop.hostname1.conf b/src/hostname/org.freedesktop.hostname1.conf index eb241c022f..eb241c022f 100644 --- a/src/org.freedesktop.hostname1.conf +++ b/src/hostname/org.freedesktop.hostname1.conf diff --git a/src/org.freedesktop.hostname1.policy.in b/src/hostname/org.freedesktop.hostname1.policy.in index 7d56b22c28..7d56b22c28 100644 --- a/src/org.freedesktop.hostname1.policy.in +++ b/src/hostname/org.freedesktop.hostname1.policy.in diff --git a/src/org.freedesktop.hostname1.service b/src/hostname/org.freedesktop.hostname1.service index 42e4adb2c9..42e4adb2c9 100644 --- a/src/org.freedesktop.hostname1.service +++ b/src/hostname/org.freedesktop.hostname1.service diff --git a/src/org.freedesktop.locale1.conf b/src/locale/org.freedesktop.locale1.conf index 68273311e7..68273311e7 100644 --- a/src/org.freedesktop.locale1.conf +++ b/src/locale/org.freedesktop.locale1.conf diff --git a/src/org.freedesktop.locale1.policy.in b/src/locale/org.freedesktop.locale1.policy.in index 1ac50bf86c..1ac50bf86c 100644 --- a/src/org.freedesktop.locale1.policy.in +++ b/src/locale/org.freedesktop.locale1.policy.in diff --git a/src/org.freedesktop.locale1.service b/src/locale/org.freedesktop.locale1.service index 29bd582459..29bd582459 100644 --- a/src/org.freedesktop.locale1.service +++ b/src/locale/org.freedesktop.locale1.service |