fixing distribution and documentation problems

diff --git a/Makefile.am b/Makefile.am
index 2ea450f4d5a13ea023d00480541d4ca7095b4878..3501e153a7ea67f0438ecb00650f41ce8e986b43 100644 (file)
--- 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 2b06eb32f6df57fc72b75ebcba14a838f2e75bb9..2ed62009b145e30e51d348ab379a263c6d1e4f04 100644 (file)
--- 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 a489d019426ef07e81bb725604c33d6f3e97b599..06d59bfb9d6db683862b4cb07f97a6e371db1ba3 100644 (file)
--- 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 \