DISTRO_PORTING: correct location of hostname-setup.c

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 51bd7c7dec735e9e9582d0d7e86d6cba670a6a63..a730ffe6009a00403d85a6a4c399b2d106f1ca22 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -477,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 \
@@ -623,6 +624,16 @@ MANPAGES_ALIAS += \
 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
@@ -746,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 $@)
@@ -787,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 \
@@ -2403,7 +2417,7 @@ dist_udevkeymap_DATA = \
        keymaps/onkyo \
        keymaps/oqo-model2 \
        keymaps/samsung-other \
-       keymaps/samsung-90x3a \
+       keymaps/samsung-series-9 \
        keymaps/samsung-sq1us \
        keymaps/samsung-sx20s \
        keymaps/toshiba-satellite_a100 \
@@ -2417,7 +2431,7 @@ dist_udevkeymapforcerel_DATA = \
        keymaps-force-release/dell-xps \
        keymaps-force-release/hp-other \
        keymaps-force-release/samsung-other \
-       keymaps-force-release/samsung-90x3a \
+       keymaps-force-release/samsung-series-9 \
        keymaps-force-release/common-volume-keys
 
 src/udev/keymap/keys.txt: Makefile
@@ -4109,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 && \