summaryrefslogtreecommitdiff
path: root/grc
diff options
context:
space:
mode:
Diffstat (limited to 'grc')
-rw-r--r--grc/freedesktop/CMakeLists.txt4
-rwxr-xr-xgrc/scripts/gnuradio-companion13
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)