util: unify getenv() logic for other PID

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4d13eea841aec09cc12dc801f43a015ef895c3cd..ab7fca677a5165f0d91f257d7858be9e2b55a7a5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -304,6 +304,7 @@ nodist_systemunit_DATA = \
        units/getty@.service \
        units/serial-getty@.service \
        units/console-shell.service \
+       units/console-getty.service \
        units/systemd-initctl.service \
        units/systemd-shutdownd.service \
        units/systemd-modules-load.service \
@@ -339,6 +340,7 @@ EXTRA_DIST += \
        units/getty@.service.m4 \
        units/serial-getty@.service.m4 \
        units/console-shell.service.m4.in \
+       units/console-getty.service.m4.in \
        units/rescue.service.m4.in \
        units/systemd-initctl.service.in \
        units/systemd-shutdownd.service.in \
@@ -681,6 +683,8 @@ libsystemd_core_la_SOURCES = \
        src/core/job.h \
        src/core/manager.c \
        src/core/manager.h \
+       src/core/transaction.c \
+       src/core/transaction.h \
        src/core/load-fragment.c \
        src/core/load-fragment.h \
        src/core/service.c \
@@ -3121,7 +3125,6 @@ systemd-install-data-hook:
                $(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service )
 if HAVE_PLYMOUTH
        $(MKDIR_P) -m 0755 \
-               $(DESTDIR)$(SYSTEM_SYSVINIT_PATH) \
                $(DESTDIR)$(systemunitdir)/reboot.target.wants \
                $(DESTDIR)$(systemunitdir)/kexec.target.wants \
                $(DESTDIR)$(systemunitdir)/poweroff.target.wants \
@@ -3253,10 +3256,10 @@ upload: all distcheck
 
 doc-sync: all
        gtkdoc-rebase --html-dir=docs/libudev/html --online
-       rsync -av --delete docs/libudev/html/ www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/libudev/
+       rsync -av --delete docs/libudev/html/ --omit-dir-times www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/libudev/
        gtkdoc-rebase --html-dir=docs/gudev/html --online
-       rsync -av --delete docs/gudev/html/ www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/gudev/
-       rsync -av man/*.html www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/man/
+       rsync -av --delete docs/gudev/html/ --omit-dir-times www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/gudev/
+       rsync -av --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/man/
 
 git-tag:
        git tag "v$(VERSION)" -m "systemd $(VERSION)"