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 14ed8081630d20f79a217aaa3ac188124e034a3f..cca6537b47743ec048801696c4869960e0fe7b62 100644 (file)
--- 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