diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-07-10 00:22:38 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-07-10 00:22:38 +0200 |
| commit | 83bda35801aa3d7ed180ec374a4bcdfe9dc1a8e4 (patch) | |
| tree | 8d043506f92ed9a0ad3197df0b412f32f938beff /Makefile.am | |
| parent | ab5506a922e407826c08506f3cc1ad69be16fd36 (diff) | |
build-sys: drop special name hack for dbus.service since a native service file is now shipped upstream dbus
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 115197e6c7..f6ae7d62c7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -129,6 +129,7 @@ dist_systemunit_DATA = \ units/sigpwr.target \ units/sockets.target \ units/swap.target \ + units/dbus.target \ units/systemd-initctl.socket \ units/systemd-logger.socket \ units/dev-hugepages.automount \ @@ -152,8 +153,7 @@ nodist_systemunit_DATA = \ units/multi-user.target \ units/systemd-initctl.service \ units/systemd-logger.service \ - units/syslog.target \ - units/dbus.target + units/syslog.target dist_sessionunit_DATA = \ units/session/default.target @@ -171,7 +171,6 @@ EXTRA_DIST = \ units/systemd-initctl.service.in \ units/systemd-logger.service.in \ units/syslog.target.in \ - units/dbus.target.in \ units/session/exit.service.in \ systemd.pc.in @@ -573,7 +572,6 @@ SED_PROCESS = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ $(SED) -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \ -e 's,@SPECIAL_SYSLOG_SERVICE\@,$(SPECIAL_SYSLOG_SERVICE),g' \ - -e 's,@SPECIAL_DBUS_SERVICE\@,$(SPECIAL_DBUS_SERVICE),g' \ -e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \ -e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \ -e 's,@pkgdatadir\@,$(pkgdatadir),g' \ |