[Commit-gnuradio] [gnuradio] 01/03: Merge branch 'maint_grcwg' into master_grcwg

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 046a46cefc74b3717398d10b44fd2bcd222c272a
Merge: 6e3fbfd be9b7a1
Author: Sebastian Koslowski <address@hidden>
Date:   Tue Nov 4 15:23:02 2014 +0100

    Merge branch 'maint_grcwg' into master_grcwg

 grc/CMakeLists.txt | 10 ++++++++++
 grc/grc.conf.in    |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --cc grc/CMakeLists.txt
index c288312,cbf4c99..3714401
--- a/grc/CMakeLists.txt
+++ b/grc/CMakeLists.txt
@@@ -67,11 -67,17 +67,21 @@@ 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")
  
+ if (APPLE)
+     set(GRC_XTERM_EXE "xterm")
+ elseif(CYGWIN)
+     set(GRC_XTERM_EXE "xterm")
+ elseif(UNIX)
+     set(GRC_XTERM_EXE "x-terminal-emulator")
+ else()
+     set(GRC_XTERM_EXE "xterm")
+ endif()
+ 
  configure_file(
      ${CMAKE_CURRENT_SOURCE_DIR}/grc.conf.in
      ${CMAKE_CURRENT_BINARY_DIR}/grc.conf