systemd-python: refuse path and flags together in __init__

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 13211c45bdfe2582c1db8f50ba17f7cf30b9e9ac..7e408798a62cf9eb06107900f7b31d58c1de2e15 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -51,9 +51,9 @@ LIBSYSTEMD_ID128_CURRENT=0
 LIBSYSTEMD_ID128_REVISION=17
 LIBSYSTEMD_ID128_AGE=0
 
-LIBSYSTEMD_JOURNAL_CURRENT=7
-LIBSYSTEMD_JOURNAL_REVISION=1
-LIBSYSTEMD_JOURNAL_AGE=7
+LIBSYSTEMD_JOURNAL_CURRENT=8
+LIBSYSTEMD_JOURNAL_REVISION=0
+LIBSYSTEMD_JOURNAL_AGE=8
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -342,8 +342,6 @@ dist_systemunit_DATA = \
        units/kexec.target \
        units/local-fs.target \
        units/local-fs-pre.target \
-       units/initrd-fs.target \
-       units/initrd-fs-pre.target \
        units/remote-fs.target \
        units/remote-fs-pre.target \
        units/network.target \
@@ -524,7 +522,7 @@ CLEANFILES += \
        man/index.html
 
 man/index.html:
-       $(AM_V_GEN)$(LN_S) systemd.index.html $@
+       $(AM_V_GEN)$(LN_S) -f systemd.index.html $@
 
 NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES))
 
@@ -3517,7 +3515,7 @@ sphinx-%:
        $(AM_V_at)echo Output has been generated in $(abs_top_builddir)/man/python-systemd/
 
 destdir-sphinx: all
-       dir="$(mktemp -d /tmp/systemd-install.XXXXXX)" && \
+       dir="$$(mktemp -d /tmp/systemd-install.XXXXXX)" && \
                $(MAKE) DESTDIR="$$dir" install && \
                $(MAKE) DESTDIR="$$dir" sphinx-html && \
                rm -rf "$$dir"