summaryrefslogtreecommitdiffstats
path: root/tools/Makefile.am
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-03-17 18:35:07 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2012-03-17 18:35:07 +0100
commit5cf53628ac8ec8f07ee1c4d7f4bd0faeac43ab36 (patch)
tree53ae95fd0f749a3db5b27342e65e07fc03a2e037 /tools/Makefile.am
parentd94ba2a5468089b657e0779ddd2f4585face37e3 (diff)
parent59c99b2d8b23f8903e2130b7a149981afe1a8bd3 (diff)
downloadrsyslog-5cf53628ac8ec8f07ee1c4d7f4bd0faeac43ab36.tar.gz
rsyslog-5cf53628ac8ec8f07ee1c4d7f4bd0faeac43ab36.tar.xz
rsyslog-5cf53628ac8ec8f07ee1c4d7f4bd0faeac43ab36.zip
Merge branch 'v5-stable' into v6-stable
Conflicts: ChangeLog configure.ac doc/manual.html
Diffstat (limited to 'tools/Makefile.am')
-rw-r--r--tools/Makefile.am3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 5c3f7a40..fef88af1 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -47,4 +47,5 @@ zpipe_LDADD = -lz
msggen_SOURCES = msggen.c
endif
-EXTRA_DIST = $(man_MANS)
+EXTRA_DIST = $(man_MANS) \
+ recover_qi.pl