diff options
author | Johnathan Corgan | 2012-02-28 19:09:01 -0800 |
---|---|---|
committer | Johnathan Corgan | 2012-02-28 19:09:01 -0800 |
commit | d71f5104ab3f4f8ec7292c3358670e6b8ce10fa7 (patch) | |
tree | 27a9b95acf61ad4d2b9f8207cfa87969f00226c9 /cmake | |
parent | 2dfcc2dc875ae82c45ab32cd34d170dc20424fc7 (diff) | |
parent | 0750b35b41b16de845c566e75b9d3bb19e008cd0 (diff) | |
download | gnuradio-d71f5104ab3f4f8ec7292c3358670e6b8ce10fa7.tar.gz gnuradio-d71f5104ab3f4f8ec7292c3358670e6b8ce10fa7.tar.bz2 gnuradio-d71f5104ab3f4f8ec7292c3358670e6b8ce10fa7.zip |
Merge branch 'master' into next
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/Modules/GrPackage.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
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") |