summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-08-26 00:26:55 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-08-26 00:26:55 -0400
commitfe540c5cc92427f2f5dcdb3a06fe3bc642dd91a2 (patch)
treef1ec3f75bd88110d8ed4d39ba34a9df3e5c023cf
parent8664963a8b9e4990affbad2be82c12d3d482f24b (diff)
install README files
-rw-r--r--discard.mk22
-rw-r--r--src/grp-journal/.gitignore1
-rw-r--r--src/grp-journal/Makefile11
-rw-r--r--src/grp-journal/README.in (renamed from src/grp-journal/var-log/README.in)0
-rw-r--r--src/grp-system/grp-utils/systemd-sysv-generator/.gitignore (renamed from src/grp-journal/var-log/.gitignore)0
-rw-r--r--src/grp-system/grp-utils/systemd-sysv-generator/Makefile6
-rw-r--r--src/grp-system/grp-utils/systemd-sysv-generator/README.in (renamed from src/grp-system/sysvinit/README.in)0
-rw-r--r--src/grp-system/sysvinit/.gitignore1
8 files changed, 18 insertions, 23 deletions
diff --git a/discard.mk b/discard.mk
index 42759a0d3b..b692c27b94 100644
--- a/discard.mk
+++ b/discard.mk
@@ -917,28 +917,6 @@ EXTRA_DIST += \
man/custom-man.xsl
# ------------------------------------------------------------------------------
-ifneq ($(HAVE_SYSV_COMPAT),)
-sysvinit_DATA = \
- docs/sysvinit/README
-
-varlog_DATA = \
- docs/var-log/README
-
-$(outdir)/README: docs/sysvinit/README.in
- $(SED_PROCESS)
-
-$(outdir)/README: docs/var-log/README.in
- $(SED_PROCESS)
-
-CLEANFILES += \
- docs/sysvinit/README \
- docs/var-log/README
-endif # HAVE_SYSV_COMPAT
-
-EXTRA_DIST += \
- docs/sysvinit/README.in \
- docs/var-log/README.in
-
SOCKETS_TARGET_WANTS += \
systemd-initctl.socket
diff --git a/src/grp-journal/.gitignore b/src/grp-journal/.gitignore
index 04d5852547..c9bd45a7be 100644
--- a/src/grp-journal/.gitignore
+++ b/src/grp-journal/.gitignore
@@ -2,3 +2,4 @@
/libsystemd-journal.pc
/audit_type-list.txt
/audit_type-*-name.*
+/README
diff --git a/src/grp-journal/Makefile b/src/grp-journal/Makefile
index f1f3453d33..25e34bda4b 100644
--- a/src/grp-journal/Makefile
+++ b/src/grp-journal/Makefile
@@ -174,4 +174,15 @@ nested.subdirs += journalctl systemd-journald libjournal-core
nested.subdirs += systemd-cat
#nested.subdirs += grp-remote
+ifneq ($(HAVE_SYSV_COMPAT),)
+varlog_DATA = \
+ docs/var-log/README
+
+CLEANFILES += \
+ docs/var-log/README
+endif # HAVE_SYSV_COMPAT
+
+EXTRA_DIST += \
+ docs/var-log/README.in
+
include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-journal/var-log/README.in b/src/grp-journal/README.in
index 2e64fb196a..2e64fb196a 100644
--- a/src/grp-journal/var-log/README.in
+++ b/src/grp-journal/README.in
diff --git a/src/grp-journal/var-log/.gitignore b/src/grp-system/grp-utils/systemd-sysv-generator/.gitignore
index c3fea7424f..c3fea7424f 100644
--- a/src/grp-journal/var-log/.gitignore
+++ b/src/grp-system/grp-utils/systemd-sysv-generator/.gitignore
diff --git a/src/grp-system/grp-utils/systemd-sysv-generator/Makefile b/src/grp-system/grp-utils/systemd-sysv-generator/Makefile
index 10dd75abc6..dfb065af90 100644
--- a/src/grp-system/grp-utils/systemd-sysv-generator/Makefile
+++ b/src/grp-system/grp-utils/systemd-sysv-generator/Makefile
@@ -29,4 +29,10 @@ systemd_sysv_generator_SOURCES = \
systemd_sysv_generator_LDADD = \
libcore.la
+sysvinit_DATA = \
+ docs/sysvinit/README
+
+EXTRA_DIST += \
+ docs/sysvinit/README.in \
+
include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-system/sysvinit/README.in b/src/grp-system/grp-utils/systemd-sysv-generator/README.in
index 996402d06b..996402d06b 100644
--- a/src/grp-system/sysvinit/README.in
+++ b/src/grp-system/grp-utils/systemd-sysv-generator/README.in
diff --git a/src/grp-system/sysvinit/.gitignore b/src/grp-system/sysvinit/.gitignore
deleted file mode 100644
index c3fea7424f..0000000000
--- a/src/grp-system/sysvinit/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/README