summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--tools/Makefile.am10
2 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 57459f5a..f33901b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
---------------------------------------------------------------------------
+Version 7.3.14 [beta] 2013-05-??
+- bugfix: some man pages were not properly installed
+ either rscryutil or rsgtutil man was installed, but not both
+ Thanks to Marius Tomaschewski for the patch.
+---------------------------------------------------------------------------
Version 7.3.13 [beta] 2013-04-29
- added omrabbitmq module (contributed, untested)
Note: this is unsupported and as such was moved immediately into the
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 4fdbc2d8..9a1497cd 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,5 +1,7 @@
sbin_PROGRAMS =
bin_PROGRAMS =
+CLEANFILES =
+man1_MANS =
man_MANS = rsyslogd.8 rsyslog.conf.5
sbin_PROGRAMS += rsyslogd
@@ -70,8 +72,8 @@ rsgtutil_CPPFLAGS = $(RSRT_CFLAGS) $(GUARDTIME_CFLAGS)
rsgtutil_LDADD = ../runtime/librsgt.la $(GUARDTIME_LIBS)
rsgtutil.1: rsgtutil.rst
$(AM_V_GEN) $(RST2MAN) $< $@
-man1_MANS = rsgtutil.1
-CLEANFILES = rsgtutil.1
+man1_MANS += rsgtutil.1
+CLEANFILES += rsgtutil.1
EXTRA_DIST+= rsgtutil.1
endif
if ENABLE_LIBGCRYPT
@@ -81,8 +83,8 @@ rscryutil_CPPFLAGS = -I../runtime $(RSRT_CFLAGS) $(LIBGCRYPT_CFLAGS)
rscryutil_LDADD = ../runtime/libgcry.la $(LIBGCRYPT_LIBS)
rscryutil.1: rscryutil.rst
$(AM_V_GEN) $(RST2MAN) $< $@
-man1_MANS = rscryutil.1
-CLEANFILES = rscryutil.1
+man1_MANS += rscryutil.1
+CLEANFILES += rscryutil.1
EXTRA_DIST+= rscryutil.1
endif
endif