From aca0061a7a7b4923cf7a71e820f68d6f838cc182 Mon Sep 17 00:00:00 2001
From: jblum <jblum@221aa14e-8319-0410-a670-987f0aec2ac5>
Date: Thu, 18 Sep 2008 18:52:42 +0000
Subject: [PATCH] making use of PACKAGE

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9603 221aa14e-8319-0410-a670-987f0aec2ac5
---
 grc/src/gui/Dialogs.py                 | 4 ++--
 grc/src/gui/Messages.py                | 4 ++--
 grc/src/platforms/base/Constants.py.in | 5 ++++-
 grc/src/platforms/base/Makefile.am     | 1 +
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/grc/src/gui/Dialogs.py b/grc/src/gui/Dialogs.py
index 415a53c9..73810967 100644
--- a/grc/src/gui/Dialogs.py
+++ b/grc/src/gui/Dialogs.py
@@ -21,7 +21,7 @@ import pygtk
 pygtk.require('2.0')
 import gtk
 from Constants import MIN_DIALOG_WIDTH, MIN_DIALOG_HEIGHT
-from .. platforms.base.Constants import VERSION
+from .. platforms.base.Constants import PACKAGE, VERSION
 import Preferences
 
 class TextDisplay(gtk.TextView):
@@ -85,8 +85,8 @@ class AboutDialog(gtk.AboutDialog):
 	def __init__(self):
 		"""AboutDialog constructor."""
 		gtk.AboutDialog.__init__(self)
+		self.set_name(PACKAGE)
 		self.set_version(VERSION)
-		self.set_name('GNU Radio Companion')
 		self.set_license(__doc__)
 		self.set_copyright(__doc__.strip().splitlines()[0])
 		self.set_website('http://gnuradio.org/trac/wiki/GNURadioCompanion')
diff --git a/grc/src/gui/Messages.py b/grc/src/gui/Messages.py
index 8f6a2804..fd925fef 100644
--- a/grc/src/gui/Messages.py
+++ b/grc/src/gui/Messages.py
@@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 """
 
-from .. platforms.base.Constants import VERSION
+from .. platforms.base.Constants import PACKAGE, VERSION
 import traceback
 import sys
 
@@ -45,7 +45,7 @@ register_messenger(sys.stdout.write)
 # Special functions for specific program functionalities
 ###########################################################################
 def send_init():
-	send("""<<< Welcome to GNU Radio Companion %s >>>\n"""%VERSION)
+	send("""<<< Welcome to %s %s >>>\n"""%(PACKAGE, VERSION))
 
 def send_page_switch(file_path):
 	send('\nShowing: "%s"\n'%file_path)
diff --git a/grc/src/platforms/base/Constants.py.in b/grc/src/platforms/base/Constants.py.in
index 26ba72d9..4ee4278f 100644
--- a/grc/src/platforms/base/Constants.py.in
+++ b/grc/src/platforms/base/Constants.py.in
@@ -19,7 +19,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 import os
 
-##The current version of this code
+##The package name.
+PACKAGE = '@PACKAGE@'
+
+##The current version.
 VERSION = '@VERSION@'
 
 ##Location of external data files.
diff --git a/grc/src/platforms/base/Makefile.am b/grc/src/platforms/base/Makefile.am
index a40d8c5b..fbfc87e0 100644
--- a/grc/src/platforms/base/Makefile.am
+++ b/grc/src/platforms/base/Makefile.am
@@ -38,6 +38,7 @@ BUILT_SOURCES = Constants.py
 
 Constants.py: Makefile $(srcdir)/Constants.py.in
 	sed \
+		-e 's|@PACKAGE[@]|$(PACKAGE)|g' \
 		-e 's|@VERSION[@]|$(VERSION)|g' \
 		-e 's|@datadir[@]|$(grc_base_data_dir)|g' \
 	$(srcdir)/Constants.py.in > $@
-- 
2.30.2