[systemd-commits] 2 commits - Makefile-man.am Makefile.am tools/make-man-rules.py

[Lennart Poettering]

 Makefile-man.am         |    2 +-
 Makefile.am             |    3 +++
 tools/make-man-rules.py |    2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit d7c9aa5e6463c68f78f634b87394c4eda9886a8f
Author: Filipe Brandenburger <filbranden at google.com>
Date:   Mon Jun 16 20:54:48 2014 -0700

    build-sys: fix indentation in make-man-rules generated output
    
    This fixes the footer where 7 spaces were used on the first line of EXTRA_DIST,
    but a Tab was clearly intended.

diff --git a/Makefile-man.am b/Makefile-man.am
index 1e321f9..1e4ec67 100644
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -1478,7 +1478,7 @@ endif
 # Really, do not edit this file.
 
 EXTRA_DIST += \
-       man/binfmt.d.xml \
+	man/binfmt.d.xml \
 	man/bootchart.conf.xml \
 	man/bootctl.xml \
 	man/bootup.xml \
diff --git a/tools/make-man-rules.py b/tools/make-man-rules.py
index 9f46f7b..e75bfff 100644
--- a/tools/make-man-rules.py
+++ b/tools/make-man-rules.py
@@ -62,7 +62,7 @@ FOOTER = '''\
 # Really, do not edit this file.
 
 EXTRA_DIST += \\
-       {files}
+	{files}
 '''
 
 def man(page, number):

commit 61b5c82d91694a51bc886a61d5cc94f473dc7dd6
Author: Filipe Brandenburger <filbranden at google.com>
Date:   Mon Jun 16 20:54:46 2014 -0700

    build-sys: add sysusers.d/systemd.conf to CLEANFILES
    
    The sysusers.d/systemd.conf configuration file was originally introduced in
    commit 1b99214789101, but it was not marked for cleanup.  This caused distcheck
    to complain about the file not being removed by distcleam.
    
    Tested: Successfully ran "make distcheck" with this patchset.

diff --git a/Makefile.am b/Makefile.am
index bd26780..9ece7a0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1828,6 +1828,9 @@ EXTRA_DIST += \
 	units/systemd-sysusers.service.in \
 	sysusers.d/systemd.conf.in
 
+CLEANFILES += \
+	sysusers.d/systemd.conf
+
 INSTALL_DIRS += \
 	$(sysusersdir)
 endif