util, manager: and mempset() and use it

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 25e0ab4307819667f94714655e86e99226c2aa0c..2a010c7ed2a28a313a727b621086c77906391fbc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -177,7 +177,7 @@ define move-to-rootlibdir
                $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
                so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \
                so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
-               ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
+               $(LN_S) -f $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
                mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \
        fi
 endef
@@ -347,6 +347,8 @@ dist_systemunit_DATA = \
        units/kexec.target \
        units/local-fs.target \
        units/local-fs-pre.target \
+       units/initrd-fs.target \
+       units/root-fs.target \
        units/remote-fs.target \
        units/remote-fs-pre.target \
        units/network.target \
@@ -3680,9 +3682,9 @@ XSLTPROC_FLAGS = \
        --nonet \
        --stringparam man.output.quietly 1 \
        --stringparam funcsynopsis.style ansi \
-       --stringparam man.th.extra1.suppress 1 \
        --stringparam man.authors.section.enabled 0 \
-       --stringparam man.copyright.section.enabled 0
+       --stringparam man.copyright.section.enabled 0 \
+       --stringparam systemd.version $(VERSION)
 
 XSLTPROC_PROCESS_MAN = \
        $(AM_V_XSLT)$(MKDIR_P) $(dir $@) && \
@@ -3711,7 +3713,7 @@ man/%.html: man/%.xml man/custom-html.xsl
        $(XSLTPROC_PROCESS_HTML)
 
 define html-alias
-       $(AM_V_LN)$(LN_S) $(notdir $<) $@
+       $(AM_V_LN)$(LN_S) -f $(notdir $<) $@
 endef
 
 endif