[gcalctool] Remove PACKAGE_ prefix from defined values

[Robert Ancell <rancell src gnome org>]

commit 6cbf91ae2d4f7dc5ee569eea3ef4608764333ee5
Author: Robert Ancell <robert ancell gmail com>
Date:   Tue Nov 3 10:22:03 2009 +1100

    Remove PACKAGE_ prefix from defined values

 src/Makefile.am |   10 +++++-----
 src/calctool.c  |    2 +-
 src/gtk.c       |    4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 97fb462..d4a07e4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,10 +4,10 @@
 INCLUDES = \
 	-I$(includedir) \
 	$(DISABLE_DEPRECATED) \
-	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-	-DPACKAGE_UI_DIR=\""$(datadir)/gcalctool"\" \
-	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-	-DPACKAGE_PIXMAP_DIR=\""$(prefix)/$(DATADIRNAME)/pixmaps"\" \
+	-DDATA_DIR=\""$(datadir)"\" \
+	-DUI_DIR=\""$(datadir)/gcalctool"\" \
+	-DLOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+	-DPIXMAP_DIR=\""$(prefix)/$(DATADIRNAME)/pixmaps"\" \
 	$(PACKAGE_CFLAGS) \
 	$(GNOME_UTILS_CFLAGS) \
 	$(GCONF_CFLAGS) \
@@ -46,7 +46,7 @@ gcalctool_SOURCES = \
 	ui.h \
 	unittest.c \
 	unittest.h
-	
+
 CLEANFILES = \
 	mp-equation-parser.h \
 	mp-equation-parser.c \
diff --git a/src/calctool.c b/src/calctool.c
index 2f51aaf..5238e1a 100644
--- a/src/calctool.c
+++ b/src/calctool.c
@@ -196,7 +196,7 @@ main(int argc, char **argv)
 
     g_type_init();
 
-    bindtextdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
+    bindtextdomain(GETTEXT_PACKAGE, LOCALE_DIR);
     bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
     textdomain(GETTEXT_PACKAGE);
 
diff --git a/src/gtk.c b/src/gtk.c
index d032a0c..b909690 100644
--- a/src/gtk.c
+++ b/src/gtk.c
@@ -124,8 +124,8 @@ static char *finc_dialog_fields[][5] = {
     {NULL,        NULL,          NULL,         NULL,         NULL}
 };
 
-#define UI_FILE      PACKAGE_UI_DIR "/gcalctool.ui"
-#define UI_FINC_FILE PACKAGE_UI_DIR "/financial.ui"
+#define UI_FILE      UI_DIR "/gcalctool.ui"
+#define UI_FINC_FILE UI_DIR "/financial.ui"
 
 #define MAXBITS 64      /* Bit panel: number of bit fields. */