fix various packaging issues and another ignored return warning

diff --git a/cmake/packaging_data.cmake b/cmake/packaging_data.cmake
index ae9b6833323e3a76ef5051f7ca55d8526ceedfa0..bf16ae0c306cb79e7c622663c4130b5ea62cea72 100644 (file)
--- a/cmake/packaging_data.cmake
+++ b/cmake/packaging_data.cmake
@@ -32,7 +32,7 @@ set (CPACK_PACKAGE_INSTALL_DIRECTORY "snort")
 set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
 set (CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/doc/start.txt")
 set (CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-set (CPACK_SOURCE_IGNORE_FILES "${CMAKE_BINARY_DIR}/;tools/snort2lua/tests/;\\\\.git/;\\\\.gitignore;extra/;autom4te.cache")
+set (CPACK_SOURCE_IGNORE_FILES "${CMAKE_BINARY_DIR}/;tools/snort2lua/tests/;\\\\.git/;\\\\.gitignore;extra/;autom4te.cache;m4")
 set (CPACK_SOURCE_GENERATOR TGZ)
 
 include(CPack)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index b9d1b949636db2bb0df63dd012d770525dea2c61..095cbf7a4af31aa74bd1638ee68c2396282bf0ba 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -196,7 +196,7 @@ snort_manual.tgz: snort_manual.txt $(all_sources)
 
 images.tgz: images/
        tar zcf $@ \
-        -C images \
+        -C ./images \
         --exclude callouts \
         --exclude README \
         .
@@ -223,9 +223,12 @@ endif
 uninstall-hook:
        rm -rf $(DESTDIR)$(docdir)/snort_manual
 
+delete_unbuilt = $(if $(and $(findstring $(builddir),$(srcdir)),$(findstring $(srcdir),$(builddir))), ,$(unbuilt_sources))
+
 clean-local:
        rm -f $(BUILT_SOURCES)
-       rm -f snort_manual.{fo,xml,html,pdf,tgz}
+       rm -f $(delete_unbuilt)
+       rm -f snort_manual.{fo,xml,html,pdf}
        rm -rf snort_manual.chunked
-       rm -f *.css
+       rm -f *.css *.tgz
 

diff --git a/extra/packaging_data.cmake b/extra/packaging_data.cmake
index 590fe4ee403be66f36b292d2c5b7c606c102883d..f70ec2859d7b40a6e4b140976c2d10e99af13e5f 100644 (file)
--- a/extra/packaging_data.cmake
+++ b/extra/packaging_data.cmake
@@ -28,7 +28,7 @@ set (CPACK_PACKAGE_INSTALL_DIRECTORY "snort")
 set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
 set (CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README")
 set (CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-set (CPACK_SOURCE_IGNORE_FILES "${CMAKE_BINARY_DIR}/;autom4te.cache;")
+set (CPACK_SOURCE_IGNORE_FILES "${CMAKE_BINARY_DIR}/;autom4te.cache;m4;")
 set (CPACK_SOURCE_GENERATOR TGZ)
 
 include(CPack)

diff --git a/src/helpers/process.cc b/src/helpers/process.cc
index a68b01d492e9806e46bc1cad78f13cadc1837dee..7c6d23bd381980535dc80aeefa03584015c63173 100644 (file)
--- a/src/helpers/process.cc
+++ b/src/helpers/process.cc
@@ -91,7 +91,7 @@ static void exit_log(const char* why)
     strncat(buf, why, sizeof(buf)-strlen(buf)-1);
     strncat(buf, " signal, exiting\n", sizeof(buf)-strlen(buf)-1);
 
-    write(STDOUT_FILENO, buf, strlen(buf));
+    (void)write(STDOUT_FILENO, buf, strlen(buf));
 }
 
 static void exit_handler(int signal)