Commit 232ba652 authored by Adrien Béraud's avatar Adrien Béraud Committed by Guillaume Roguez
Browse files

rebranding: update configure path

Refs #64797

Change-Id: Ieed7b25a0c04b2b50c58d828626a345ddfdb6903
parent cc77af35
......@@ -26,7 +26,7 @@ LT_INIT(disable-static)
CFLAGS="$CFLAGS -Wall -Wextra -Wshadow"
dnl uninstalled gsr ui dir
AC_DEFINE_UNQUOTED(SFLPHONE_UIDIR_UNINSTALLED, "`pwd`/src/",
AC_DEFINE_UNQUOTED(RING_UIDIR_UNINSTALLED, "`pwd`/src/",
[path to uninstalled Ring UI dir])
PKG_CHECK_MODULES(DBUSGLIB, dbus-glib-1 >= 0.75);
......
......@@ -23,7 +23,7 @@ AM_CPPFLAGS = $(DEPS_CFLAGS) \
-DDATADIR=\""$(datadir)"\" \
-DLIBDIR=\""$(libdir)"\" \
-DLOCALEDIR=\""$(localedir)"\" \
-DSFLPHONE_UIDIR=\""$(datadir)/ring/ui"\" \
-DRING_UIDIR=\""$(datadir)/ring/ui"\" \
-DPLUGINS_DIR=\""$(sflplugindir)"\"
indent:
@echo "Indenting code:"
......
......@@ -1087,12 +1087,12 @@ GtkBuilder *uibuilder_new(void)
GtkBuilder* uibuilder = gtk_builder_new();
GError *error = NULL;
/* try local dir first */
gchar *ui_path = g_build_filename(SFLPHONE_UIDIR_UNINSTALLED, "ring_menus.ui", NULL);
gchar *ui_path = g_build_filename(RING_UIDIR_UNINSTALLED, "ring_menus.ui", NULL);
if (!g_file_test(ui_path, G_FILE_TEST_EXISTS)) {
/* try install dir */
g_free(ui_path);
ui_path = g_build_filename(SFLPHONE_UIDIR, "ring_menus.ui", NULL);
ui_path = g_build_filename(RING_UIDIR, "ring_menus.ui", NULL);
/* if neither dir exists then we cannot load the UI */
if (!g_file_test(ui_path, G_FILE_TEST_EXISTS)) {
......
......@@ -25,7 +25,7 @@ AM_CPPFLAGS = $(DEPS_CFLAGS) \
-DDATADIR=\""$(datadir)"\" \
-DLIBDIR=\""$(libdir)"\" \
-DLOCALEDIR=\""$(localedir)"\" \
-DSFLPHONE_UIDIR=\""$(datadir)/ring/ui"\" \
-DRING_UIDIR=\""$(datadir)/ring/ui"\" \
-DPLUGINS_DIR=\""$(sflplugindir)"\"
indent:
@echo "Indenting code:"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment