bugfix: data files cannot be found once installed

nbourdau · Jun 23, 2011 · 3e1be21 · 3e1be21
1 parent 7760840
commit 3e1be21
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/configure.ac b/configure.ac
@@ -61,7 +61,7 @@ AC_CHECK_FUNCS([nanosleep gettimeofday ftime _ftime])
 AC_CHECK_FUNC_FNARG([GetSystemTimeAsFileTime], [0], [#include <windows.h>])
 AC_REPLACE_FUNCS([clock_gettime clock_nanosleep])
 
-AX_DEFINE_DIR([PKGDATADIR], [pkgdatadir], [read-only architecture-independent data path])
+AX_DEFINE_DIR([DATADIR], [datadir], [read-only architecture-independent data path])
 
 AC_SUBST([CURRENT],[lib_current])
 AC_SUBST([REVISION],[lib_revision])

diff --git a/src/gtk-led.c b/src/gtk-led.c
@@ -181,7 +181,7 @@ void gtk_led_class_init(GtkLedClass *klass)
 	prefix = getenv("MCPANEL_DATADIR");
 	for (i=0; i<NUM_COLORS_LED; i++) {
 		snprintf(path, sizeof(path)-1, "%s/%s",
-				prefix ? prefix : PKGDATADIR,
+				prefix ? prefix : DATADIR"/"PACKAGE,
 				led_image_path[i]);
 		pixbuf = gdk_pixbuf_new_from_file(path, NULL);
 		klass->icon_sets[i] = gtk_icon_set_new_from_pixbuf(pixbuf);

diff --git a/src/mcp_gui.c b/src/mcp_gui.c
@@ -447,7 +447,7 @@ int create_panel_gui(mcpanel* pan, const char* uifile, unsigned int ntab,
 	if (!uifile) {
 		envpath = getenv("MCPANEL_DATADIR");
 		snprintf(path, sizeof(path)-1, "%s/default.ui",
-		                            envpath ? envpath : PKGDATADIR);
+		                     envpath ? envpath : DATADIR"/"PACKAGE);
 		uifile = path;
 	}