[systemd-commits] 3 commits - Makefile.am

[Lennart Poettering]

 Makefile.am |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

New commits:
commit e82e442bfa66eb982b1694250bdafdbd0de54032
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon May 17 23:29:24 2010 +0200

    build-sys: don't fail if we cannot create /cgroup/debug

diff --git a/Makefile.am b/Makefile.am
index 83740d7..f67f22d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -405,8 +405,8 @@ install-data-hook:
 		$(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/debug || echo "Don't forget to create /cgroup/debug! Couldn't create it for you, continuing anyway."
 	( cd $(DESTDIR)$(sysconfdir)/xdg/systemd/ && \
 		rm -f session && \
 		$(LN_S) $(pkgsysconfdir)/session session )
commit c3bd732210fb2f53bbea2ffc55d16a35e098ff94
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon May 17 23:29:10 2010 +0200

    build-sys: enable xsltproc rules only if we have xsltproc

diff --git a/Makefile.am b/Makefile.am
index c9a73e1..83740d7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -350,7 +350,7 @@ CLEANFILES = \
 	man/systemd.special.7 \
 	man/systemd.special.html
 
-#if HAVE_XSLTPROC
+if HAVE_XSLTPROC
 XSLTPROC_PROCESS_MAN = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
 	$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
@@ -393,7 +393,7 @@ CLEANFILES += \
 	man/systemd.unit.html \
 	man/systemd.service.html \
 	man/systemd.special.html.in
-#endif
+endif
 
 install-data-hook:
 	$(MKDIR_P) -m 0755 \
commit 2a3d6294675e1c540429a26610d180c0ce15f31f
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon May 17 23:28:54 2010 +0200

    build-sys: simplify sed rules

diff --git a/Makefile.am b/Makefile.am
index 1b2e140..c9a73e1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -317,10 +317,7 @@ SED_PROCESS = \
 units/%: units/%.in Makefile
 	$(SED_PROCESS)
 
-man/%.html: man/%.html.in Makefile
-	$(SED_PROCESS)
-
-man/%.7: man/%.7.in Makefile
+man/%: man/%.in Makefile
 	$(SED_PROCESS)
 
 M4_PROCESS_SYSTEM = \