chiark / gitweb /
man: add systemd-journal-gatewayd page
[elogind.git] / Makefile.am
index 2c84fe1c7e4a1d714a77655bfa977d80c2d6e966..4569d7a16de10086166c60082887fdb43b07a1fc 100644 (file)
@@ -35,20 +35,20 @@ LIBGUDEV_REVISION=2
 LIBGUDEV_AGE=1
 
 LIBSYSTEMD_LOGIN_CURRENT=3
-LIBSYSTEMD_LOGIN_REVISION=9
+LIBSYSTEMD_LOGIN_REVISION=10
 LIBSYSTEMD_LOGIN_AGE=3
 
 LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=5
+LIBSYSTEMD_DAEMON_REVISION=6
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=15
+LIBSYSTEMD_ID128_REVISION=16
 LIBSYSTEMD_ID128_AGE=0
 
-LIBSYSTEMD_JOURNAL_CURRENT=6
+LIBSYSTEMD_JOURNAL_CURRENT=7
 LIBSYSTEMD_JOURNAL_REVISION=0
-LIBSYSTEMD_JOURNAL_AGE=6
+LIBSYSTEMD_JOURNAL_AGE=7
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -62,7 +62,11 @@ polkitpolicydir=$(datadir)/polkit-1/actions
 bashcompletiondir=$(sysconfdir)/bash_completion.d
 rpmmacrosdir=$(sysconfdir)/rpm
 sysvinitdir=$(SYSTEM_SYSVINIT_PATH)
+sysvrcddir=$(SYSTEM_SYSVRCND_PATH)
 varlogdir=$(localstatedir)/log
+systemdstatedir=$(localstatedir)/lib/systemd
+catalogstatedir=$(systemdstatedir)/catalog
+hwdb_bin=/etc/udev/hwdb.bin
 
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/systemd
@@ -78,9 +82,10 @@ systemsleepdir=$(rootlibexecdir)/system-sleep
 systemunitdir=$(rootprefix)/lib/systemd/system
 systempresetdir=$(rootprefix)/lib/systemd/system-preset
 udevlibexecdir=$(rootprefix)/lib/udev
-udevhomedir = $(udevlibexecdir)
-udevrulesdir = $(udevlibexecdir)/rules.d
-udevhwdbdir = $(udevlibexecdir)/hwdb.d
+udevhomedir=$(udevlibexecdir)
+udevrulesdir=$(udevlibexecdir)/rules.d
+udevhwdbdir=$(udevlibexecdir)/hwdb.d
+catalogdir=$(prefix)/lib/systemd/catalog
 
 # And these are the special ones for /
 rootprefix=@rootprefix@
@@ -93,6 +98,7 @@ BUILT_SOURCES =
 INSTALL_EXEC_HOOKS =
 UNINSTALL_EXEC_HOOKS =
 INSTALL_DATA_HOOKS =
+UNINSTALL_DATA_HOOKS =
 DISTCLEAN_LOCAL_HOOKS =
 pkginclude_HEADERS =
 noinst_LTLIBRARIES =
@@ -125,6 +131,8 @@ AM_CPPFLAGS = \
        -DUSER_CONFIG_FILE=\"$(pkgsysconfdir)/user.conf\" \
        -DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \
        -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \
+       -DCATALOG_PATH=\"$(catalogstatedir)\" \
+       -DHWDB_BIN=\"$(hwdb_bin)\" \
        -DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
        -DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\" \
        -DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
@@ -226,7 +234,6 @@ rootlibexec_PROGRAMS = \
        systemd-update-utmp \
        systemd-shutdownd \
        systemd-shutdown \
-       systemd-modules-load \
        systemd-remount-fs \
        systemd-reply-password \
        systemd-fsck \
@@ -235,6 +242,11 @@ rootlibexec_PROGRAMS = \
        systemd-sysctl \
        systemd-sleep
 
+if HAVE_KMOD
+rootlibexec_PROGRAMS += \
+       systemd-modules-load
+endif
+
 systemgenerator_PROGRAMS = \
        systemd-getty-generator \
        systemd-fstab-generator \
@@ -315,7 +327,6 @@ nodist_systemunit_DATA = \
        units/console-getty.service \
        units/systemd-initctl.service \
        units/systemd-shutdownd.service \
-       units/systemd-modules-load.service \
        units/systemd-remount-fs.service \
        units/systemd-update-utmp-runlevel.service \
        units/systemd-update-utmp-shutdown.service \
@@ -341,6 +352,11 @@ nodist_systemunit_DATA = \
        units/systemd-udev-settle.service \
        units/debug-shell.service
 
+if HAVE_KMOD
+nodist_systemunit_DATA += \
+       units/systemd-modules-load.service
+endif
+
 dist_userunit_DATA = \
        units/user/default.target \
        units/user/exit.target
@@ -356,7 +372,6 @@ EXTRA_DIST += \
        units/rescue.service.m4.in \
        units/systemd-initctl.service.in \
        units/systemd-shutdownd.service.in \
-       units/systemd-modules-load.service.in \
        units/systemd-remount-fs.service.in \
        units/systemd-update-utmp-runlevel.service.in \
        units/systemd-update-utmp-shutdown.service.in \
@@ -385,6 +400,11 @@ EXTRA_DIST += \
        introspect.awk \
        man/custom-html.xsl
 
+if HAVE_KMOD
+EXTRA_DIST += \
+       units/systemd-modules-load.service.in
+endif
+
 if TARGET_FEDORA
 dist_systemunit_DATA += \
        units/fedora/rc-local.service \
@@ -457,6 +477,7 @@ MANPAGES = \
        man/systemd.kill.5 \
        man/systemd.special.7 \
        man/systemd.journal-fields.7 \
+       man/systemd.time.7 \
        man/kernel-command-line.7 \
        man/daemon.7 \
        man/bootup.7 \
@@ -473,8 +494,6 @@ MANPAGES = \
        man/locale.conf.5 \
        man/os-release.5 \
        man/machine-info.5 \
-       man/modules-load.d.5 \
-       man/systemd-modules-load.service.8 \
        man/sysctl.d.5 \
        man/systemd-sysctl.service.8 \
        man/systemd-ask-password.1 \
@@ -517,13 +536,13 @@ MANPAGES = \
        man/sd_journal_get_usage.3 \
        man/sd_journal_add_match.3 \
        man/sd_journal_seek_head.3 \
-       man/sd_journal_query_unique.3
+       man/sd_journal_query_unique.3 \
+       man/sd_journal_get_catalog.3
 
 MANPAGES_ALIAS = \
        man/reboot.8 \
        man/poweroff.8 \
        man/init.1 \
-       man/systemd-modules-load.8 \
        man/systemd-sysctl.8 \
        man/systemd-journald.socket.8 \
        man/systemd-journald.8 \
@@ -593,12 +612,31 @@ MANPAGES_ALIAS = \
        man/sd_journal_test_cursor.3 \
        man/sd_journal_enumerate_unique.3 \
        man/sd_journal_restart_unique.3 \
-       man/SD_JOURNAL_FOREACH_UNIQUE.3
+       man/SD_JOURNAL_FOREACH_UNIQUE.3 \
+       man/sd_journal_get_catalog_for_message_id.3
+
+if HAVE_KMOD
+MANPAGES += \
+       man/modules-load.d.5 \
+       man/systemd-modules-load.service.8
+MANPAGES_ALIAS += \
+       man/systemd-modules-load.8
+man/systemd-modules-load.8: man/systemd-modules-load.service.8
+endif
+
+if HAVE_MICROHTTPD
+MANPAGES += \
+       man/systemd-journal-gatewayd.service.8
+MANPAGES_ALIAS += \
+       man/systemd-journal-gatewayd.socket.8 \
+       man/systemd-journal-gatewayd.8
+man/systemd-journal-gatewayd.socket.8: man/systemd-journal-gatewayd.service.8
+man/systemd-journal-gatewayd.8: man/systemd-journal-gatewayd.service.8
+endif
 
 man/reboot.8: man/halt.8
 man/poweroff.8: man/halt.8
 man/init.1: man/systemd.1
-man/systemd-modules-load.8: man/systemd-modules-load.service.8
 man/systemd-sysctl.8: man/systemd-sysctl.service.8
 man/systemd-journald.socket.8: man/systemd-journald.service.8
 man/systemd-journald.8: man/systemd-journald.service.8
@@ -669,6 +707,7 @@ man/sd_journal_test_cursor.3: man/sd_journal_get_cursor.3
 man/sd_journal_enumerate_unique.3: man/sd_journal_query_unique.3
 man/sd_journal_restart_unique.3: man/sd_journal_query_unique.3
 man/SD_JOURNAL_FOREACH_UNIQUE.3: man/sd_journal_query_unique.3
+man/sd_journal_get_catalog_for_message_id.3: man/sd_journal_get_catalog.3
 
 XML_FILES = \
        ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
@@ -718,7 +757,8 @@ XML_DIRECTIVE_FILES = \
        man/systemd.kill.xml \
        man/systemd.device.xml \
        man/systemd.conf.xml \
-       man/systemd.journal-fields.xml
+       man/systemd.journal-fields.xml \
+       man/systemd.time.xml
 
 man/systemd.directives.xml: make-directive-index.py $(XML_DIRECTIVE_FILES)
        $(AM_V_at)$(MKDIR_P) $(dir $@)
@@ -759,6 +799,8 @@ libsystemd_shared_la_SOURCES = \
        src/shared/virt.h \
        src/shared/path-util.c \
        src/shared/path-util.h \
+       src/shared/time-util.c \
+       src/shared/time-util.h \
        src/shared/hashmap.c \
        src/shared/hashmap.h \
        src/shared/set.c \
@@ -798,12 +840,16 @@ libsystemd_shared_la_SOURCES = \
        src/shared/spawn-ask-password-agent.h \
        src/shared/specifier.c \
        src/shared/specifier.h \
+       src/shared/replace-var.c \
+       src/shared/replace-var.h \
        src/shared/spawn-polkit-agent.c \
        src/shared/spawn-polkit-agent.h \
        src/shared/hwclock.c \
        src/shared/hwclock.h \
        src/shared/time-dst.c \
-       src/shared/time-dst.h
+       src/shared/time-dst.h \
+       src/shared/calendarspec.c \
+       src/shared/calendarspec.h
 
 #-------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -1005,8 +1051,6 @@ libsystemd_core_la_SOURCES = \
        src/core/selinux-setup.h \
        src/core/ima-setup.c \
        src/core/ima-setup.h \
-       src/core/kmod-setup.c \
-       src/core/kmod-setup.h \
        src/core/locale-setup.h \
        src/core/locale-setup.c \
        src/core/hostname-setup.c \
@@ -1042,6 +1086,12 @@ libsystemd_core_la_SOURCES = \
        src/core/audit-fd.c \
        src/core/audit-fd.h
 
+if HAVE_KMOD
+libsystemd_core_la_SOURCES += \
+       src/core/kmod-setup.c \
+       src/core/kmod-setup.h
+endif
+
 nodist_libsystemd_core_la_SOURCES = \
        src/core/load-fragment-gperf.c \
        src/core/load-fragment-gperf-nulstr.c \
@@ -1182,7 +1232,10 @@ noinst_PROGRAMS += \
        test-log \
        test-unit-file \
        test-date \
-       test-sleep
+       test-sleep \
+       test-replace-var \
+       test-sched-prio \
+       test-calendarspec
 
 TESTS += \
        test-job-type \
@@ -1191,7 +1244,17 @@ TESTS += \
        test-unit-name \
        test-unit-file \
        test-date \
-       test-sleep
+       test-sleep \
+       test-replace-var \
+       test-sched-prio \
+       test-calendarspec
+
+EXTRA_DIST += \
+       test/sched_idle_bad.service \
+       test/sched_idle_ok.service \
+       test/sched_rr_bad.service \
+       test/sched_rr_ok.service \
+       test/sched_rr_change.service
 
 test_engine_SOURCES = \
        src/test/test-engine.c
@@ -1244,6 +1307,10 @@ test_unit_name_LDADD = \
 test_unit_file_SOURCES = \
        src/test/test-unit-file.c
 
+test_unit_file_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS)
+
 test_unit_file_LDADD = \
        libsystemd-core.la
 
@@ -1265,6 +1332,18 @@ test_sleep_SOURCES = \
 test_sleep_LDADD = \
        libsystemd-core.la
 
+test_replace_var_SOURCES = \
+       src/test/test-replace-var.c
+
+test_replace_var_LDADD = \
+       libsystemd-shared.la
+
+test_calendarspec_SOURCES = \
+       src/test/test-calendarspec.c
+
+test_calendarspec_LDADD = \
+       libsystemd-shared.la
+
 test_daemon_SOURCES = \
        src/test/test-daemon.c
 
@@ -1309,6 +1388,18 @@ test_watchdog_SOURCES = \
 test_watchdog_LDADD = \
        libsystemd-shared.la
 
+test_sched_prio_SOURCES = \
+       src/test/test-sched-prio.c
+
+test_sched_prio_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS) \
+       -D"STR(s)=\#s" -D"TEST_DIR=STR($(abs_top_srcdir)/test/)"
+
+test_sched_prio_LDADD = \
+       libsystemd-core.la \
+       libsystemd-daemon.la
+
 # ------------------------------------------------------------------------------
 systemd_initctl_SOURCES = \
        src/initctl/initctl.c
@@ -1363,6 +1454,7 @@ systemd_shutdown_LDADD = \
        libsystemd-shared.la \
        libudev.la
 
+if HAVE_KMOD
 # ------------------------------------------------------------------------------
 systemd_modules_load_SOURCES = \
        src/modules-load/modules-load.c
@@ -1374,6 +1466,7 @@ systemd_modules_load_CFLAGS = \
 systemd_modules_load_LDADD = \
        libsystemd-shared.la \
        $(KMOD_LIBS)
+endif
 
 # ------------------------------------------------------------------------------
 systemd_tmpfiles_SOURCES = \
@@ -1445,7 +1538,7 @@ systemd_detect_virt_LDADD = \
        libsystemd-shared.la
 
 systemd-detect-virt-install-hook:
-       $(SETCAP) cap_dac_override,cap_sys_ptrace=ep $(DESTDIR)$(bindir)/systemd-detect-virt ||:
+       -$(SETCAP) cap_dac_override,cap_sys_ptrace=ep $(DESTDIR)$(bindir)/systemd-detect-virt
 
 INSTALL_EXEC_HOOKS += \
        systemd-detect-virt-install-hook
@@ -1793,9 +1886,13 @@ dist_udevrules_DATA += \
        rules/75-net-description.rules \
        rules/75-tty-description.rules \
        rules/78-sound-card.rules \
-       rules/80-drivers.rules \
        rules/95-udev-late.rules
 
+if HAVE_KMOD
+dist_udevrules_DATA += \
+       rules/80-drivers.rules
+endif
+
 dist_udevhwdb_DATA = \
        hwdb/20-pci-vendor-product.hwdb \
        hwdb/20-pci-classes.hwdb \
@@ -1857,12 +1954,10 @@ libudev_core_la_SOURCES = \
        src/udev/udev-rules.c \
        src/udev/udev-ctrl.c \
        src/udev/udev-builtin.c \
-       src/udev/udev-builtin-blkid.c \
        src/udev/udev-builtin-btrfs.c \
        src/udev/udev-builtin-firmware.c \
        src/udev/udev-builtin-hwdb.c \
        src/udev/udev-builtin-input_id.c \
-       src/udev/udev-builtin-kmod.c \
        src/udev/udev-builtin-net_id.c \
        src/udev/udev-builtin-path_id.c \
        src/udev/udev-builtin-usb_id.c \
@@ -1884,6 +1979,16 @@ libudev_core_la_CPPFLAGS = \
        $(AM_CPPFLAGS) \
        -DFIRMWARE_PATH="$(FIRMWARE_PATH)"
 
+if HAVE_KMOD
+libudev_core_la_SOURCES += \
+       src/udev/udev-builtin-kmod.c
+endif
+
+if HAVE_BLKID
+libudev_core_la_SOURCES += \
+       src/udev/udev-builtin-blkid.c
+endif
+
 if HAVE_ACL
 libudev_core_la_SOURCES += \
        src/udev/udev-builtin-uaccess.c \
@@ -1915,6 +2020,17 @@ udevadm_LDADD = \
        libudev-core.la \
        libsystemd-shared.la
 
+# Update hwdb on installation. Do not bother if installing
+# in DESTDIR, since this is likely for packaging purposes.
+hwdb-update-hook:
+       -test -n "$(DESTDIR)" || $(bindir)/udevadm hwdb --update
+
+INSTALL_DATA_HOOKS += \
+       hwdb-update-hook
+
+hwdb-remove-hook:
+       -test -n "$(DESTDIR)" || rm -f $(HWDB_BIN)
+
 # ------------------------------------------------------------------------------
 TESTS += \
        test/udev-test.pl \
@@ -2422,42 +2538,12 @@ EXTRA_DIST += \
 # ------------------------------------------------------------------------------
 systemd_journald_SOURCES = \
        src/journal/journald.c \
-       src/journal/journald.h \
-       src/journal/journald-kmsg.c \
-       src/journal/journald-kmsg.h \
-       src/journal/journald-syslog.c \
-       src/journal/journald-syslog.h \
-       src/journal/journald-stream.c \
-       src/journal/journald-stream.h \
-       src/journal/journald-console.c \
-       src/journal/journald-console.h \
-       src/journal/journald-native.c \
-       src/journal/journald-native.h \
-       src/journal/journald-rate-limit.c \
-       src/journal/journald-rate-limit.h \
-       src/journal/journal-internal.h
-
-nodist_systemd_journald_SOURCES = \
-       src/journal/journald-gperf.c
+       src/journal/journald-server.h
 
 systemd_journald_LDADD = \
-       libsystemd-label.la \
-       libsystemd-shared.la \
-       libsystemd-audit.la \
-       libsystemd-daemon.la \
-       libsystemd-id128-internal.la \
        libsystemd-journal-internal.la \
-       libudev.la
-
-if ENABLE_LOGIND
-systemd_journald_LDADD += \
-       libsystemd-login-internal.la
-endif
-
-if HAVE_ACL
-systemd_journald_LDADD += \
-       libsystemd-acl.la
-endif
+       libsystemd-shared.la \
+       libsystemd-id128-internal.la
 
 systemd_cat_SOURCES = \
        src/journal/cat.c
@@ -2514,12 +2600,11 @@ test_journal_send_LDADD = \
        libsystemd-id128-internal.la
 
 test_journal_syslog_SOURCES = \
-       src/journal/test-journal-syslog.c \
-       src/journal/journald-syslog.c
+       src/journal/test-journal-syslog.c
 
 test_journal_syslog_LDADD = \
-       libsystemd-shared.la \
        libsystemd-journal-internal.la \
+       libsystemd-shared.la \
        libsystemd-id128-internal.la
 
 test_journal_match_SOURCES = \
@@ -2561,6 +2646,15 @@ test_mmap_cache_LDADD = \
        libsystemd-shared.la \
        libsystemd-journal-internal.la
 
+test_catalog_SOURCES = \
+       src/journal/test-catalog.c
+
+test_catalog_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-label.la \
+       libsystemd-journal-internal.la \
+       libsystemd-id128-internal.la
+
 libsystemd_journal_la_SOURCES = \
        src/journal/sd-journal.c \
        src/systemd/sd-journal.h \
@@ -2575,6 +2669,8 @@ libsystemd_journal_la_SOURCES = \
        src/journal/journal-send.c \
        src/journal/journal-def.h \
        src/journal/compress.h \
+       src/journal/catalog.c \
+       src/journal/catalog.h \
        src/journal/mmap-cache.c \
        src/journal/mmap-cache.h
 
@@ -2590,15 +2686,50 @@ libsystemd_journal_la_LDFLAGS = \
 
 libsystemd_journal_la_LIBADD = \
        libsystemd-shared.la \
+       libsystemd-label.la \
        libsystemd-id128-internal.la
 
 libsystemd_journal_internal_la_SOURCES = \
-       $(libsystemd_journal_la_SOURCES)
+       $(libsystemd_journal_la_SOURCES) \
+       src/journal/journald-kmsg.c \
+       src/journal/journald-kmsg.h \
+       src/journal/journald-syslog.c \
+       src/journal/journald-syslog.h \
+       src/journal/journald-stream.c \
+       src/journal/journald-stream.h \
+       src/journal/journald-server.c \
+       src/journal/journald-server.h \
+       src/journal/journald-console.c \
+       src/journal/journald-console.h \
+       src/journal/journald-native.c \
+       src/journal/journald-native.h \
+       src/journal/journald-rate-limit.c \
+       src/journal/journald-rate-limit.h \
+       src/journal/journal-internal.h
 
 libsystemd_journal_internal_la_CFLAGS = \
        $(AM_CFLAGS)
 
-libsystemd_journal_internal_la_LIBADD =
+libsystemd_journal_internal_la_LIBADD = \
+       libsystemd-label.la \
+       libsystemd-audit.la \
+       libsystemd-daemon.la \
+       libudev.la \
+       libsystemd-shared.la \
+       libsystemd-label.la
+
+nodist_libsystemd_journal_internal_la_SOURCES = \
+       src/journal/journald-gperf.c
+
+if ENABLE_LOGIND
+libsystemd_journal_internal_la_LIBADD += \
+       libsystemd-login-internal.la
+endif
+
+if HAVE_ACL
+libsystemd_journal_internal_la_LIBADD += \
+       libsystemd-acl.la
+endif
 
 if HAVE_XZ
 libsystemd_journal_la_SOURCES += \
@@ -2659,6 +2790,20 @@ libsystemd-journal-uninstall-hook:
 UNINSTALL_EXEC_HOOKS += \
        libsystemd-journal-uninstall-hook
 
+# Update catalog on installation. Do not bother if installing
+# in DESTDIR, since this is likely for packaging purposes.
+catalog-update-hook:
+       -test -n "$(DESTDIR)" || $(rootbindir)/journalctl --update-catalog
+
+INSTALL_DATA_HOOKS += \
+       catalog-update-hook
+
+catalog-remove-hook:
+       -test -n "$(DESTDIR)" || rm -f $(catalogstatedir)/database
+
+UNINSTALL_DATA_HOOKS += \
+       catalog-remove-hook
+
 noinst_PROGRAMS += \
        test-journal \
        test-journal-send \
@@ -2667,7 +2812,8 @@ noinst_PROGRAMS += \
        test-journal-enum \
        test-journal-stream \
        test-journal-verify \
-       test-mmap-cache
+       test-mmap-cache \
+       test-catalog
 
 TESTS += \
        test-journal \
@@ -2711,6 +2857,9 @@ dist_pkgsysconf_DATA += \
 pkgconfiglib_DATA += \
        src/journal/libsystemd-journal.pc
 
+dist_catalog_DATA = \
+       catalog/systemd.catalog
+
 journal-install-data-hook:
        $(MKDIR_P) -m 0755 \
                $(DESTDIR)$(systemunitdir)/sockets.target.wants \
@@ -3521,7 +3670,7 @@ polkitpolicy_files += \
 logind-install-data-hook:
        $(MKDIR_P) -m 0755 \
                $(DESTDIR)$(systemunitdir)/multi-user.target.wants \
-               $(DESTDIR)$(localstatedir)/lib/systemd
+               $(DESTDIR)$(systemdstatedir)
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f dbus-org.freedesktop.login1.service && \
                $(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service)
@@ -3675,6 +3824,11 @@ SED_PROCESS = \
                -e 's,@userunitdir\@,$(userunitdir),g' \
                -e 's,@systempresetdir\@,$(systempresetdir),g' \
                -e 's,@userpresetdir\@,$(userpresetdir),g' \
+               -e 's,@udevhwdbdir\@,$(udevhwdbdir),g' \
+               -e 's,@udevrulesdir\@,$(udevrulesdir),g' \
+               -e 's,@catalogdir\@,$(catalogdir),g' \
+               -e 's,@tmpfilesdir\@,$(tmpfilesdir),g' \
+               -e 's,@sysctldir\@,$(sysctldir),g' \
                -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
                -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
                -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \
@@ -3825,6 +3979,8 @@ CLEANFILES += \
 
 endif
 
+EXTRA_DIST += \
+       shell-completion/systemd-zsh-completion.zsh
 
 systemd-install-data-hook:
        $(MKDIR_P) -m 0755 \
@@ -3930,7 +4086,6 @@ systemd-install-data-hook:
                        sys-kernel-config.mount \
                        sys-kernel-debug.mount \
                        sys-fs-fuse-connections.mount \
-                       systemd-modules-load.service \
                        systemd-tmpfiles-setup.service \
                        systemd-sysctl.service \
                        systemd-ask-password-console.path && \
@@ -3939,7 +4094,6 @@ systemd-install-data-hook:
                $(LN_S) ../sys-kernel-config.mount sys-kernel-config.mount && \
                $(LN_S) ../sys-kernel-debug.mount sys-kernel-debug.mount && \
                $(LN_S) ../sys-fs-fuse-connections.mount sys-fs-fuse-connections.mount && \
-               $(LN_S) ../systemd-modules-load.service systemd-modules-load.service && \
                $(LN_S) ../systemd-tmpfiles-setup.service systemd-tmpfiles-setup.service && \
                $(LN_S) ../systemd-sysctl.service systemd-sysctl.service && \
                $(LN_S) ../systemd-ask-password-console.path systemd-ask-password-console.path )
@@ -3950,6 +4104,13 @@ systemd-install-data-hook:
                rm -f org.freedesktop.systemd1.service && \
                $(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service )
 
+if HAVE_KMOD
+       ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
+               rm -f systemd-modules-load.service && \
+               $(LN_S) ../systemd-modules-load.service systemd-modules-load.service )
+endif
+
+
 if TARGET_FEDORA
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f display-manager.service single.service && \
@@ -3962,12 +4123,6 @@ if TARGET_MANDRIVA
                $(LN_S) rescue.service single.service )
 endif
 
-if TARGET_DEBIAN_OR_UBUNTU
-       ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f runlevel5.target && \
-               $(LN_S) multi-user.target runlevel5.target )
-endif
-
 if TARGET_SUSE
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f local.service && \
@@ -3981,7 +4136,7 @@ endif
 
 install-exec-hook: $(INSTALL_EXEC_HOOKS)
 
-uninstall-hook: $(UNINSTALL_EXEC_HOOKS)
+uninstall-hook: $(UNINSTALL_DATA_HOOKS) $(UNINSTALL_EXEC_HOOKS)
 
 install-data-hook: systemd-install-data-hook $(INSTALL_DATA_HOOKS)
 
@@ -3992,7 +4147,6 @@ clean-local:
        rm -f $(abs_srcdir)/hwdb/usb.ids $(abs_srcdir)/hwdb/pci.ids $(abs_srcdir)/hwdb/oui.txt
 
 DISTCHECK_CONFIGURE_FLAGS = \
-       --with-sysvinit-path=$$dc_install_base/$(sysvinitdir) \
        --with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
        --with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \
        --with-dbussystemservicedir=$$dc_install_base/$(dbussystemservicedir) \
@@ -4001,6 +4155,13 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --with-rootprefix=$$dc_install_base \
        --disable-split-usr
 
+
+if HAVE_SYSV_COMPAT
+DISTCHECK_CONFIGURE_FLAGS += \
+       --with-sysvinit-path=$$dc_install_base/$(sysvinitdir) \
+       --with-sysvrcnd-path=$$dc_install_base/$(sysvrcddir)
+endif
+
 if ENABLE_GTK_DOC
 DISTCHECK_CONFIGURE_FLAGS += \
        --enable-gtk-doc
@@ -4009,7 +4170,7 @@ endif
 hwdb-update:
        ( cd hwdb && \
        wget -N http://www.linux-usb.org/usb.ids && \
-       wget -N http://pciids.sourceforge.net/v2.2/pci.ids && \
+       wget -N http://pci-ids.ucw.cz/v2.2/pci.ids && \
        wget -N http://standards.ieee.org/develop/regauth/oui/oui.txt && \
        ./ids-update.pl )