Merge pull request #81 in SNORT/snort3 from cmake_readme_fix to master

Squashed commit of the following:

commit 03f7138b33ee2dba6c507a75fb962555eda429f3
Author: Joel Cornett <joel.cornett@gmail.com>
Date:   Wed Oct 14 20:48:10 2015 -0400

    changed README -> README.md in Makefile.am

commit a7b1ad0184fcc0da709d18c4a6fa7216e5b677d1
Author: Joel Cornett <joel.cornett@gmail.com>
Date:   Wed Oct 14 18:21:30 2015 -0400

    changed README -> README.md

diff --git a/Makefile.am b/Makefile.am
index 0649d3a4cebd491a97d82c52ea73400b11d82bc4..8bccd4a58043b89d9fbfb97c817e1e9f13541be1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,7 @@ AM_CXXFLAGS = @AM_CXXFLAGS@
 
 EXTRA_DIST = \
 snort.pc.in \
-README \
+README.md \
 COPYING \
 LICENSE
 

diff --git a/cmake/packaging_data.cmake b/cmake/packaging_data.cmake
index fa3ad2188c94e72cadef9ed8b3f49378a35ba2a2..73f00b8693318b2a175ff4827672e932758811f2 100644 (file)
--- a/cmake/packaging_data.cmake
+++ b/cmake/packaging_data.cmake
@@ -14,7 +14,7 @@ set (CPACK_PACKAGE_VERSION_PATCH "${SNORT_VERSION_BUILD}")
 set (CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/doc/images/snort.png")
 set (CPACK_PACKAGE_INSTALL_DIRECTORY "snort")
 set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
-set (CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README")
+set (CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README.md")
 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 "tools/snort2lua/tests/;\\\\.git/;\\\\.gitignore;extra/;${AUTOTOOL_FILES}")
 set (CPACK_SOURCE_GENERATOR TGZ)