units: fix syntax of mount unit files

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 2a0d6bb358a0311c3b121474f42062b31f4ed0fb..3589b735b0a6cb55d917e0f7624b13b227e6b589 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -82,7 +82,16 @@ dist_systemunit_DATA = \
        units/sockets.target \
        units/swap.target \
        units/systemd-initctl.socket \
-       units/systemd-logger.socket
+       units/systemd-logger.socket \
+       units/dev-hugepages.automount \
+       units/dev-hugepages.mount \
+       units/dev-mqueue.automount \
+       units/dev-mqueue.mount \
+       units/proc-sys-fs-binfmt_misc.automount \
+       units/proc-sys-fs-binfmt_misc.mount \
+       units/sys-kernel-debug.automount \
+       units/sys-kernel-debug.mount \
+       units/var-run.mount
 
 systemunit_DATA = \
        units/basic.target \
@@ -308,7 +317,7 @@ systemadm_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(VALA_CFLA
 systemadm_LDADD = $(DBUSGLIB_LIBS) $(GTK_LIBS)
 
 SED_PROCESS = \
-       $(AM_V_GEN)$(MKDIR_P) units && \
+       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
        $(SED)  -e 's,@libexecdir\@,$(libexecdir),g' \
                -e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
                -e 's,@SPECIAL_SYSLOG_SERVICE\@,$(SPECIAL_SYSLOG_SERVICE),g' \
@@ -317,18 +326,15 @@ SED_PROCESS = \
 units/%: units/%.in Makefile
        $(SED_PROCESS)
 
-man/%.html: $(builddir)/man/%.html.in Makefile
-       $(SED_PROCESS)
-
-man/%.7: $(builddir)/man/%.7.in Makefile
+man/%: man/%.in Makefile
        $(SED_PROCESS)
 
 M4_PROCESS_SYSTEM = \
-       $(AM_V_GEN)$(MKDIR_P) units && \
+       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
        $(M4) -P $(M4_DISTRO_FLAG) -DFOR_SYSTEM=1 < $< > $@
 
 M4_PROCESS_SESSION = \
-       $(AM_V_GEN)$(MKDIR_P) units/session && \
+       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
        $(M4) -P $(M4_DISTRO_FLAG) -DFOR_SESSION=1 < $< > $@
 
 units/%: units/%.m4 Makefile
@@ -338,9 +344,6 @@ units/session/%: units/%.m4 Makefile
        $(M4_PROCESS_SESSION)
 
 CLEANFILES = \
-       src/systemd-interfaces.c \
-       src/systemctl.c \
-       src/systemadm.c \
        units/systemd-initctl.service \
        units/systemd-logger.service \
        units/syslog.target \
@@ -353,22 +356,29 @@ CLEANFILES = \
        man/systemd.special.7 \
        man/systemd.special.html
 
-#if HAVE_XSLTPROC
+if HAVE_VALAC
+CLEANFILES += \
+       src/systemd-interfaces.c \
+       src/systemctl.c \
+       src/systemadm.c
+endif
+
+if HAVE_XSLTPROC
 XSLTPROC_PROCESS_MAN = \
-       $(AM_V_GEN)$(MKDIR_P) man && \
+       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
        $(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
 XSLTPROC_PROCESS_MAN_IN = \
-       $(AM_V_GEN)$(MKDIR_P) man && \
+       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
        $(XSLTPROC) -o ${@:.in=} -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< && \
        mv ${@:.in=} $@
 
 XSLTPROC_PROCESS_HTML = \
-       $(AM_V_GEN)$(MKDIR_P) man && \
+       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
        $(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $<
 
 XSLTPROC_PROCESS_HTML_IN = \
-       $(AM_V_GEN)$(MKDIR_P) man && \
+       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
        $(XSLTPROC) -o ${@:.in=} -nonet http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $< && \
        mv ${@:.in=} $@
 
@@ -396,20 +406,23 @@ CLEANFILES += \
        man/systemd.unit.html \
        man/systemd.service.html \
        man/systemd.special.html.in
-#endif
+endif
 
 install-data-hook:
        $(MKDIR_P) -m 0755 \
                $(DESTDIR)$(systemunitdir) \
                $(DESTDIR)$(sessionunitdir) \
                $(DESTDIR)$(systemunitdir)/sockets.target.wants \
+               $(DESTDIR)$(systemunitdir)/basic.target.wants \
                $(DESTDIR)$(pkgsysconfdir)/system \
                $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants \
+               $(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants \
                $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants \
                $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants \
                $(DESTDIR)$(pkgsysconfdir)/session \
-               $(DESTDIR)$(sysconfdir)/xdg/systemd \
-               $(DESTDIR)/cgroup/debug
+               $(DESTDIR)$(sysconfdir)/xdg/systemd
+       $(MKDIR_P) -m 0755 $(DESTDIR)/cgroup/systemd || \
+               echo "Don't forget to create /cgroup/systemd! Couldn't create it for you, continuing anyway."
        ( cd $(DESTDIR)$(sysconfdir)/xdg/systemd/ && \
                rm -f session && \
                $(LN_S) $(pkgsysconfdir)/session session )
@@ -449,6 +462,15 @@ install-data-hook:
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
                rm -f getty.target && \
                $(LN_S) $(systemunitdir)/getty.target getty.target )
+       ( cd $(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants && \
+               rm -f var-run.mount && \
+               $(LN_S) $(systemunitdir)/var-run.mount var-run.mount )
+       ( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
+               rm -f dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount && \
+               $(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \
+               $(LN_S) ../dev-mqueue.automount dev-mqueue.automount && \
+               $(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount && \
+               $(LN_S) ../sys-kernel-debug.automount sys-kernel-debug.automount )
 if TARGET_FEDORA
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
                rm -f prefdm.service && \