diff options
| author | Johnathan Corgan | 2010-05-18 13:53:39 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2010-05-18 13:53:39 -0700 |
| commit | 8944000061cbfb995e56b74ab03034ec3541caac (patch) | |
| tree | a09047db796ce926286118682a31921c522ea7b4 | |
| parent | fefb71787e7e365049743f210b18a6f04f13d47b (diff) | |
| download | gnuradio-8944000061cbfb995e56b74ab03034ec3541caac.tar.gz gnuradio-8944000061cbfb995e56b74ab03034ec3541caac.tar.bz2 gnuradio-8944000061cbfb995e56b74ab03034ec3541caac.zip | |
grc: rename execution binary from 'grc' to 'gnuradio-companion'
This change resolves a conflict with the Generic Colorizer application
which also uses the binary name 'grc'.
Interested users can add an alias to their shell environment to run
gnuradio-companion when grc is invoked.
| -rw-r--r-- | grc/freedesktop/Makefile.am | 2 | ||||
| -rw-r--r-- | grc/freedesktop/gnuradio-gnuradio-companion.desktop (renamed from grc/freedesktop/gnuradio-grc.desktop) | 2 | ||||
| -rw-r--r-- | grc/freedesktop/grc_setup_freedesktop.in | 2 | ||||
| -rw-r--r-- | grc/scripts/Makefile.am | 4 | ||||
| -rwxr-xr-x | grc/scripts/gnuradio-companion (renamed from grc/scripts/grc) | 0 |
5 files changed, 5 insertions, 5 deletions
diff --git a/grc/freedesktop/Makefile.am b/grc/freedesktop/Makefile.am index bfbdee940..23bb70bf5 100644 --- a/grc/freedesktop/Makefile.am +++ b/grc/freedesktop/Makefile.am @@ -30,7 +30,7 @@ dist_ourdata_DATA = \ grc-icon-48.png \ grc-icon-32.png \ gnuradio-grc.xml \ - gnuradio-grc.desktop \ + gnuradio-gnuradio-companion.desktop \ gnuradio-usrp2_probe.desktop \ gnuradio-usrp_probe.desktop diff --git a/grc/freedesktop/gnuradio-grc.desktop b/grc/freedesktop/gnuradio-gnuradio-companion.desktop index d9c70ca92..5fd049780 100644 --- a/grc/freedesktop/gnuradio-grc.desktop +++ b/grc/freedesktop/gnuradio-gnuradio-companion.desktop @@ -2,7 +2,7 @@ Version=1.0 Type=Application Name=GRC -Exec=grc %F +Exec=gnuradio-companion %F Categories=Development; MimeType=application/gnuradio-grc; Icon=gnuradio-grc diff --git a/grc/freedesktop/grc_setup_freedesktop.in b/grc/freedesktop/grc_setup_freedesktop.in index db6506452..a0c5ac193 100644 --- a/grc/freedesktop/grc_setup_freedesktop.in +++ b/grc/freedesktop/grc_setup_freedesktop.in @@ -8,7 +8,7 @@ ################################################## ICON_SIZES="32 48 64 128 256" -MENU_ITEMS="grc usrp2_probe usrp_probe" +MENU_ITEMS="gnuradio-companion usrp2_probe usrp_probe" if [ -n "$2" ]; then SRCDIR="$2" else diff --git a/grc/scripts/Makefile.am b/grc/scripts/Makefile.am index e24f88800..9019ec5cc 100644 --- a/grc/scripts/Makefile.am +++ b/grc/scripts/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2008, 2009 Free Software Foundation, Inc. +# Copyright 2008, 2009, 2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -21,4 +21,4 @@ include $(top_srcdir)/Makefile.common -dist_bin_SCRIPTS = grc usrp2_probe usrp_probe +dist_bin_SCRIPTS = gnuradio-companion usrp2_probe usrp_probe diff --git a/grc/scripts/grc b/grc/scripts/gnuradio-companion index a4115c39f..a4115c39f 100755 --- a/grc/scripts/grc +++ b/grc/scripts/gnuradio-companion |