From: Josh <jrosenba@cisco.com>
Date: Thu, 20 Nov 2014 21:15:51 +0000 (-0600)
Subject: fixing distribution and documentation problems
X-Git-Tag: 3.0.0-233~1169^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10fe12183fd46060196aaa9ad4a659a6f0ee60d7;p=thirdparty%2Fsnort3.git

fixing distribution and documentation problems
---

diff --git a/Makefile.am b/Makefile.am
index 2ea450f4d..3501e153a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,6 @@ doc
 AM_CXXFLAGS = @AM_CXXFLAGS@
 
 EXTRA_DIST = \
-ChangeLog \
 snort.pc.in
 
 DISTCLEANFILES = \
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 2b06eb32f..2ed62009b 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -220,7 +220,7 @@ endif()
 #  create the recipes for building the files
 
 
-set (PDF_ARGUMENTS --icons --icons-dir=./images/icons --resource=${CMAKE_CURRENT_SOURCE_DIR}/images )
+set (PDF_ARGUMENTS --resource=${CMAKE_CURRENT_SOURCE_DIR}/images )
 set (HTML_ARGUMENTS --copy --attribute linkcss --attribute stylesdir --attribute disable-javascript --attribute quirks! ${PDF_ARGUMENTS})
 
 add_custom_command(OUTPUT snort_manual.html
diff --git a/doc/Makefile.am b/doc/Makefile.am
index a489d0194..06d59bfb9 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -151,9 +151,7 @@ version.txt: $(snort)
 snort2lua_cmds.txt: $(snort2lua)
 	$(snort2lua) --markup --help > $@
 
-pdf_args = \
-    --icons --icons-dir=./images/icons \
-    -a imagesdir=./images
+pdf_args = -a imagesdir=./images
 
 html_args = \
     --copy --attribute linkcss --attribute stylesdir \