Change the GLADEDIR define to RESOURCEDIR

And point the variable at the right directory so it can find
the .ui file.

diff --git a/Makefile.am b/Makefile.am
index 61c38055872fbeaa957159a6df8ce2dc73ed3e66..950486fcc587a4d798b5fdd08f37a4be588b260f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,7 +23,7 @@ src_obconf_CPPFLAGS = \
        $(XML_CFLAGS) \
        -DLOCALEDIR=\"$(localedir)\" \
        -DPIXMAPDIR=\"$(pixmapdir)\" \
-       -DGLADEDIR=\"$(gladedir)\" \
+       -DRESOURCEDIR=\"$(resourcedir)\" \
        -DTHEMEDIR=\"$(themedir)\" \
        -DG_LOG_DOMAIN=\"Obconf\"
 src_obconf_LDADD = \

diff --git a/src/main.c b/src/main.c
index ff11ef9fe93f4b9c75f1d2b79396f9ed2c93b337..2cbbbd66568750d84cfbb6d97355c267b8054b31 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -218,7 +218,7 @@ int main(int argc, char **argv)
         return 0;
     }
 
-    p = g_build_filename(GLADEDIR, "obconf.ui", NULL);
+    p = g_build_filename(RESOURCEDIR, "obconf.ui", NULL);
     builder = gtk_builder_new();
     gtk_builder_add_from_file(builder, p, &error);
     g_free(p);