From: Russ Combs <rucombs@cisco.com>
Date: Thu, 4 Dec 2014 16:55:20 +0000 (-0500)
Subject: fix various packaging issues and another ignored return warning
X-Git-Tag: 3.0.0-233~1109
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ecbb746a93e5fc7380ae84a5ebd32dae539a395;p=thirdparty%2Fsnort3.git

fix various packaging issues and another ignored return warning
---

diff --git a/cmake/packaging_data.cmake b/cmake/packaging_data.cmake
index ae9b68333..bf16ae0c3 100644
--- 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 b9d1b9496..095cbf7a4 100644
--- 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 590fe4ee4..f70ec2859 100644
--- 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 a68b01d49..7c6d23bd3 100644
--- 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)