pam: make sure we don't assign colliding session ids if we get our session ids from...

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6cdacbe02ba4831c54ccd1ccee1162e3a4c8b47b..e41ba48e24d7d08861f801f40b2dfd63126a4964 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -165,9 +165,6 @@ EXTRA_DIST = \
        units/systemd-logger.service.in \
        units/syslog.target.in \
        units/session/exit.service.in \
-       LICENSE \
-       README \
-       DISTRO_PORTING \
        systemd.pc.in
 
 if TARGET_FEDORA
@@ -208,6 +205,8 @@ endif
 
 dist_doc_DATA = \
        README \
+       LICENSE \
+       DISTRO_PORTING \
        src/sd-daemon.h \
        src/sd-daemon.c
 
@@ -307,14 +306,32 @@ EXTRA_DIST += \
 
 dist_man_MANS = \
        man/systemd.unit.5 \
-       man/systemd.service.5
+       man/systemd.service.5 \
+       man/daemon.7 \
+       man/systemd.8 \
+       man/sd_notify.3 \
+       man/sd_booted.3 \
+       man/sd_listen_fds.3 \
+       man/sd_is_fifo.3 \
+       man/sd-daemon.7 \
+       man/runlevel.8 \
+       man/systemd-install.1
 
 nodist_man_MANS = \
        man/systemd.special.7
 
 dist_noinst_DATA = \
        man/systemd.unit.html \
-       man/systemd.service.html
+       man/systemd.service.html \
+       man/daemon.html \
+       man/systemd.html \
+       man/sd_notify.html \
+       man/sd_booted.html \
+       man/sd_listen_fds.html \
+       man/sd_is_fifo.html \
+       man/sd-daemon.html \
+       man/runlevel.html \
+       man/systemd-install.html
 
 nodist_noinst_DATA = \
        man/systemd.special.html
@@ -324,7 +341,16 @@ EXTRA_DIST += \
        man/systemd.service.xml \
        man/systemd.special.xml.in \
        man/systemd.special.7.in \
-       man/systemd.special.html.in
+       man/systemd.special.html.in \
+       man/daemon.xml \
+       man/systemd.xml \
+       man/sd_notify.xml \
+       man/sd_booted.xml \
+       man/sd_listen_fds.xml \
+       man/sd_is_fifo.xml \
+       man/sd-daemon.xml \
+       man/runlevel.xml \
+       man/systemd-install.xml
 
 systemd_SOURCES = \
        src/main.c
@@ -550,24 +576,40 @@ CLEANFILES += \
 endif
 
 if HAVE_XSLTPROC
+XSLTPROC_FLAGS = \
+       --nonet \
+       --param funcsynopsis.style "'ansi'"
+
 XSLTPROC_PROCESS_MAN = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-       $(XSLTPROC) -o $@ --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+       $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
 XSLTPROC_PROCESS_MAN_IN = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-       $(XSLTPROC) -o ${@:.in=} --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< && \
+       $(XSLTPROC) -o ${@:.in=} $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< && \
        mv ${@:.in=} $@
 
 XSLTPROC_PROCESS_HTML = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-       $(XSLTPROC) -o $@ --nonet http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $<
+       $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $<
 
 XSLTPROC_PROCESS_HTML_IN = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-       $(XSLTPROC) -o ${@:.in=} --nonet http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $< && \
+       $(XSLTPROC) -o ${@:.in=} $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $< && \
        mv ${@:.in=} $@
 
+man/%.3: man/%.xml
+       $(XSLTPROC_PROCESS_MAN)
+
+man/%.3.in: man/%.xml.in
+       $(XSLTPROC_PROCESS_MAN)
+
+man/%.1: man/%.xml
+       $(XSLTPROC_PROCESS_MAN)
+
+man/%.1.in: man/%.xml.in
+       $(XSLTPROC_PROCESS_MAN)
+
 man/%.5: man/%.xml
        $(XSLTPROC_PROCESS_MAN)
 
@@ -580,6 +622,12 @@ man/%.7: man/%.xml
 man/%.7.in: man/%.xml.in
        $(XSLTPROC_PROCESS_MAN_IN)
 
+man/%.8: man/%.xml
+       $(XSLTPROC_PROCESS_MAN)
+
+man/%.8.in: man/%.xml.in
+       $(XSLTPROC_PROCESS_MAN_IN)
+
 man/%.html: man/%.xml
        $(XSLTPROC_PROCESS_HTML)
 
@@ -591,7 +639,15 @@ CLEANFILES += \
        man/systemd.special.7.in \
        man/systemd.unit.html \
        man/systemd.service.html \
-       man/systemd.special.html.in
+       man/systemd.special.html.in \
+       man/daemon.html \
+       man/runlevel.html \
+       man/sd_booted.html \
+       man/sd-daemon.html \
+       man/sd_is_fifo.html \
+       man/sd_listen_fds.html \
+       man/sd_notify.html \
+       man/systemd.html
 endif
 
 org.freedesktop.systemd1.%.xml: systemd
@@ -611,8 +667,8 @@ install-data-hook:
                $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants \
                $(DESTDIR)$(pkgsysconfdir)/session \
                $(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."
+       $(MKDIR_P) -m 0755 $(DESTDIR)/cgroup || \
+               echo "Don't forget to create /cgroup! Couldn't create it for you, continuing anyway."
        ( cd $(DESTDIR)$(sysconfdir)/xdg/systemd/ && \
                rm -f session && \
                $(LN_S) $(pkgsysconfdir)/session session )
@@ -668,6 +724,8 @@ install-data-hook:
                rm -f org.freedesktop.systemd1.service && \
                $(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service )
 if TARGET_FEDORA
+       $(MKDIR_P) -m 0755 \
+               $(DESTDIR)$(SYSTEM_SYSVINIT_PATH)
        ( cd $(DESTDIR)$(pkgsysconfdir)/system && \
                rm -f display-manager.service && \
                $(LN_S) $(systemunitdir)/prefdm.service display-manager.service )
@@ -680,7 +738,7 @@ if TARGET_FEDORA
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f local.service && \
                $(LN_S) rc-local.service local.service )
-       ( cd $(DESTDIR)/etc/init.d && \
+       ( cd $(DESTDIR)$(SYSTEM_SYSVINIT_PATH) && \
                $(LN_S) halt reboot > /dev/null 2>&1 || true )
 endif
 if TARGET_GENTOO