From 5f80187454db0e3072185b7090416fcbe7204bf8 Mon Sep 17 00:00:00 2001
From: Nicholas Corgan
Date: Tue, 28 Feb 2012 16:01:33 -0800
Subject: Installer filename more clearly separates "gnuradio", version, and
 distro

---
 cmake/Modules/GrPackage.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cmake/Modules/GrPackage.cmake')

diff --git a/cmake/Modules/GrPackage.cmake b/cmake/Modules/GrPackage.cmake
index a65a2f8a7..92f2567f9 100644
--- a/cmake/Modules/GrPackage.cmake
+++ b/cmake/Modules/GrPackage.cmake
@@ -123,7 +123,7 @@ if((DEBIAN OR REDHAT) AND LSB_RELEASE_EXECUTABLE)
     )
 
     #set a more sensible package name for this system
-    SET(CPACK_PACKAGE_FILE_NAME "gnuradio-${CPACK_PACKAGE_VERSION}-${LSB_ID}-${LSB_RELEASE}-${CMAKE_SYSTEM_PROCESSOR}")
+    SET(CPACK_PACKAGE_FILE_NAME "gnuradio_${CPACK_PACKAGE_VERSION}_${LSB_ID}-${LSB_RELEASE}-${CMAKE_SYSTEM_PROCESSOR}")
 
     #now try to include the component based dependencies
     set(package_deps_file "${CMAKE_SOURCE_DIR}/cmake/Packaging/${LSB_ID}-${LSB_RELEASE}.cmake")
-- 
cgit 


From 7ee3ea3f089122d568b06f8d86111c2df9cf798a Mon Sep 17 00:00:00 2001
From: Nicholas Corgan
Date: Wed, 29 Feb 2012 09:27:57 -0800
Subject: Changes Windows installer filename to match naming convention of
 Ubuntu and Fedora installers

---
 cmake/Modules/GrPackage.cmake | 1 +
 1 file changed, 1 insertion(+)

(limited to 'cmake/Modules/GrPackage.cmake')

diff --git a/cmake/Modules/GrPackage.cmake b/cmake/Modules/GrPackage.cmake
index 92f2567f9..3aca79632 100644
--- a/cmake/Modules/GrPackage.cmake
+++ b/cmake/Modules/GrPackage.cmake
@@ -134,6 +134,7 @@ if((DEBIAN OR REDHAT) AND LSB_RELEASE_EXECUTABLE)
 endif()
 
 if(${CPACK_GENERATOR} STREQUAL NSIS)
+    set(CPACK_PACKAGE_FILE_NAME "gnuradio_${CPACK_PACKAGE_VERSION}_win32")
     set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CMAKE_PROJECT_NAME}")
 endif()
 
-- 
cgit