diff options
| author | Johnathan Corgan | 2012-02-02 13:34:40 -0800 |
|---|---|---|
| committer | Johnathan Corgan | 2012-02-02 13:34:40 -0800 |
| commit | 3bc34ff378d08e623b020d84c495cbc000ffab97 (patch) | |
| tree | 704c750be51317825c61cda3739bb1c1b80a06f7 | |
| parent | 0371e7b427008f6f5fc39cc98a39a73e68362b8a (diff) | |
| parent | 309ca769afb74a091a5c923e1bb5fb71f535dee6 (diff) | |
| download | gnuradio-3bc34ff378d08e623b020d84c495cbc000ffab97.tar.gz gnuradio-3bc34ff378d08e623b020d84c495cbc000ffab97.tar.bz2 gnuradio-3bc34ff378d08e623b020d84c495cbc000ffab97.zip | |
Merge branch 'master' into next
| -rw-r--r-- | grc/freedesktop/CMakeLists.txt | 4 | ||||
| -rwxr-xr-x | grc/scripts/gnuradio-companion | 13 |
2 files changed, 13 insertions, 4 deletions
diff --git a/grc/freedesktop/CMakeLists.txt b/grc/freedesktop/CMakeLists.txt index 8c0f53d9f..492b0f7d8 100644 --- a/grc/freedesktop/CMakeLists.txt +++ b/grc/freedesktop/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2011 Free Software Foundation, Inc. +# Copyright 2011-2012 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -41,7 +41,7 @@ if(UNIX AND HAVE_XDG_UTILS) ${CMAKE_CURRENT_BINARY_DIR}/grc_setup_freedesktop @ONLY) install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/grc_setup_freedesktop + PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/grc_setup_freedesktop DESTINATION ${GR_PKG_LIBEXEC_DIR} COMPONENT "grc" ) endif(UNIX AND HAVE_XDG_UTILS) diff --git a/grc/scripts/gnuradio-companion b/grc/scripts/gnuradio-companion index a4115c39f..e76322b4d 100755 --- a/grc/scripts/gnuradio-companion +++ b/grc/scripts/gnuradio-companion @@ -1,6 +1,6 @@ #!/usr/bin/env python """ -Copyright 2009 Free Software Foundation, Inc. +Copyright 2009-2012 Free Software Foundation, Inc. This file is part of GNU Radio GNU Radio Companion is free software; you can redistribute it and/or @@ -25,7 +25,16 @@ import gtk try: from gnuradio import gr except ImportError, e: d = gtk.MessageDialog(type=gtk.MESSAGE_ERROR, buttons=gtk.BUTTONS_CLOSE, message_format=""" -Cannot import gnuradio. Are your PYTHONPATH and LD_LIBRARY_PATH set correctly?""") +Cannot import gnuradio. + +Is the python path environment variable set correctly? + All OS: PYTHONPATH + +Is the library path environment variable set correctly? + Linux: LD_LIBRARY_PATH + Windows: PATH + MacOSX: DYLD_LIBRARY_PATH +""") d.set_title(str(e)) d.run() exit(-1) |