units: pull in shutdown.target and umount.target when entering emergency mode

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c89f519438522cc7d81ff8b68731a4a1de1eef5f..57b8aa525c881957cfedf162c901135a039b2b93 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -126,9 +126,11 @@ dist_systemunit_DATA = \
        units/rpcbind.target \
        units/rtc-set.target \
        units/shutdown.target \
+       units/umount.target \
        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 +154,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 +172,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 +573,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' \
@@ -794,3 +793,11 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --with-udevrulesdir=$$dc_install_base/$(udevrulesdir) \
        --with-pamlibdir=$$dc_install_base/$(pamlibdir) \
        --with-rootdir=$$dc_install_base/$(rootdir)
+
+upload: all distcheck
+       cp -v systemd-$(VERSION).tar.bz2 /home/lennart/cvs.fedora/systemd/devel/
+       scp systemd-$(VERSION).tar.bz2 fdo:/srv/www.freedesktop.org/www/software/systemd/
+       scp man/*.html tango:public/systemd-man/
+
+git-tag:
+       git tag "v$(VERSION)" -m "systemd $(VERSION)"