[Commit-gnuradio] [gnuradio] 04/07: grc: append blocks path with prefix /usr/local if installed to prefix /usr

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 567a4986683e6d3c66b8d5d41cc1625cc92e6e88
Author: Sebastian Koslowski <address@hidden>
Date:   Thu Oct 2 10:41:16 2014 +0200

    grc: append blocks path with prefix /usr/local if installed to prefix /usr
---
 grc/CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt
index 05c1293..c288312 100644
--- a/grc/CMakeLists.txt
+++ b/grc/CMakeLists.txt
@@ -67,6 +67,10 @@ CPACK_COMPONENT("grc"
 # Create and install the grc conf file
 ########################################################################
 file(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX}/${GRC_BLOCKS_DIR} blocksdir)
+if(CMAKE_INSTALL_PREFIX STREQUAL "/usr")
+    # linux binary installs: append blocks dir with prefix /usr/local
+    set(blocksdir ${blocksdir}:/usr/local/${GRC_BLOCKS_DIR})
+endif(CMAKE_INSTALL_PREFIX STREQUAL "/usr")
 
 configure_file(
     ${CMAKE_CURRENT_SOURCE_DIR}/grc.conf.in