summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2012-02-10 17:28:19 +1100
committerRobert Ancell <robert.ancell@canonical.com>2012-02-10 17:28:19 +1100
commit4de9f37175ede84285d347ed7952d840380030bd (patch)
treecc44635ef7f157b28c0ebd92f7751293d5fc0b63
parent494d1ae01f7e73df6d119a40e7a5f59c7ef788ac (diff)
downloadlightdm-gtk-greeter-4de9f37175ede84285d347ed7952d840380030bd.tar.gz
Load greeter configuration from correct directory
-rw-r--r--NEWS4
-rw-r--r--src/Makefile.am2
2 files changed, 5 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index ade55f5..9c9d360 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Overview of changes in lightdm-gtk-greeter 1.1.4
+
+ * Load greeter configuration from correct directory
+
Overview of changes in lightdm-gtk-greeter 1.1.3
* Fix greeter looking for data in the wrong directory
diff --git a/src/Makefile.am b/src/Makefile.am
index 30e815c..1f8c0f4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,7 +7,7 @@ lightdm_gtk_greeter_CFLAGS = \
-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
-DLOCALEDIR=\""$(localedir)"\" \
-DGREETER_DATA_DIR=\""$(datadir)/lightdm-gtk-greeter"\" \
- -DCONFIG_FILE=\""$(configdir)/lightdm-gtk-greeter.conf"\" \
+ -DCONFIG_FILE=\""$(sysconfdir)/lightdm/lightdm-gtk-greeter.conf"\" \
$(GREETER_CFLAGS) \
$(WARN_CFLAGS)