diff -Naru gnocky-0.0.2.orig/src/Makefile.am gnocky-0.0.2/src/Makefile.am
--- gnocky-0.0.2.orig/src/Makefile.am 2004-04-27 19:26:00.000000000 +0300
+++ gnocky-0.0.2/src/Makefile.am 2004-06-20 17:57:21.488250947 +0300
@@ -2,7 +2,7 @@
## Process this file with automake to produce Makefile.in
INCLUDES = \
- -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
+ -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
@PACKAGE_CFLAGS@
diff -Naru gnocky-0.0.2.orig/src/Makefile.in gnocky-0.0.2/src/Makefile.in
--- gnocky-0.0.2.orig/src/Makefile.in 2004-04-27 19:26:23.000000000 +0300
+++ gnocky-0.0.2/src/Makefile.in 2004-06-20 17:57:21.489250678 +0300
@@ -204,7 +204,7 @@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
INCLUDES = \
- -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
+ -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
@PACKAGE_CFLAGS@
diff -Naru gnocky-0.0.2.orig/src/utils.c gnocky-0.0.2/src/utils.c
--- gnocky-0.0.2.orig/src/utils.c 2004-03-09 19:17:38.000000000 +0200
+++ gnocky-0.0.2/src/utils.c 2004-06-20 17:57:21.489250678 +0300
@@ -152,7 +152,6 @@
/* We first try any pixmaps directories set by the application. */
dir = g_slist_prepend(dir, PACKAGE_DATA_DIR "/pixmaps");
- dir = g_slist_prepend(dir, PACKAGE_SOURCE_DIR "/pixmaps");
while (dir) {
found_filename = check_file_exists((gchar *) dir->data, filename);
@@ -163,10 +162,6 @@
dir = dir->next;
}
- /* If we haven't found the pixmap, try the source directory. */
- if (!found_filename)
- found_filename = check_file_exists("../pixmaps", filename);
-
if (!found_filename) {
g_warning("Couldn't find pixmap file: %s", filename);
return NULL;
@@ -189,9 +184,7 @@
if (!filename || !filename[0])
return NULL;
- g_print(PACKAGE_DATA_DIR "/" PACKAGE "/glade" "\n");
- dir = g_slist_prepend(dir, PACKAGE_DATA_DIR "/" PACKAGE "/glade");
- dir = g_slist_prepend(dir, PACKAGE_SOURCE_DIR "/src/glade");
+ dir = g_slist_prepend(dir, PACKAGE_DATA_DIR "/glade");
while (dir) {
found_filename = check_file_exists((gchar *) dir->data, filename);
@@ -202,9 +195,6 @@
dir = dir->next;
}
- if (!found_filename)
- found_filename = check_file_exists("./src/glade", filename);
-
if (!found_filename) {
g_warning("Couldn't find XML file: %s", filename);
return NULL;
