From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Fri, 7 Oct 2016 21:16:01 +0000 (-0400)
Subject: Merge pull request #666 in SNORT/snort3 from doc_fix to master
X-Git-Tag: 3.0.0-233~231
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc7f2dea4c807c850e13825fea11ecdc628e3a73;p=thirdparty%2Fsnort3.git

Merge pull request #666 in SNORT/snort3 from doc_fix to master

Squashed commit of the following:

commit 11c831971210984a04e2b0721724b36f6d739f8b
Author: Russ Combs <rucombs@cisco.com>
Date:   Fri Oct 7 15:34:09 2016 -0400

    do not delete default manuals when cleaning in tree
---

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 14ed80816..cca6537b4 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -56,11 +56,6 @@ snort_manual.pdf \
 online_manual.sh \
 dev_guide.sh
 
-doc_DATA = \
-snort_manual.text \
-snort_manual.html \
-snort_manual.pdf
-
 dist_doc_DATA = \
 $(unbuilt_sources)
 
@@ -207,7 +202,6 @@ delete_unbuilt = $(if $(and $(findstring $(builddir),$(srcdir)),$(findstring $(s
 clean-local:
 	rm -f $(BUILT_SOURCES)
 	rm -f $(delete_unbuilt)
-	rm -f $(doc_DATA)
 	rm -f snort_manual.{fo,xml}
 	rm -rf snort_manual.chunked
 	rm -f *.css *.tgz