[gdm/wip/initial-setup] Install initial-setup data files below /usr/share/gdm
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdm/wip/initial-setup] Install initial-setup data files below /usr/share/gdm
- Date: Thu, 19 May 2011 02:33:55 +0000 (UTC)
commit 8b29a186db4089cbc7bfe848158f638c9528c12f
Author: Matthias Clasen <mclasen redhat com>
Date: Wed May 18 22:32:46 2011 -0400
Install initial-setup data files below /usr/share/gdm
This is where they belong; we are still using control-center
locations for the data files and images of the timezone map.
gui/initial-setup/Makefile.am | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/gui/initial-setup/Makefile.am b/gui/initial-setup/Makefile.am
index ee2e8a1..a32dc90 100644
--- a/gui/initial-setup/Makefile.am
+++ b/gui/initial-setup/Makefile.am
@@ -1,9 +1,13 @@
-uidir = $(datadir)/gnome-control-center/ui/setup
+uidir = $(datadir)/gdm/initial-setup
+# GNOMECC_DATA_DIR is used in tz.c
+# DATADIR is used in cc-timezone-map.c
+# these two files are copied from gnome-control-center,
+# which explains the slightly odd locations
AM_CPPFLAGS = \
$(INITIAL_SETUP_CFLAGS) \
- -DGNOMECC_DATA_DIR="\"$(datadir)/gnome-control-center\"" \
-DUIDIR="\"$(uidir)\"" \
+ -DGNOMECC_DATA_DIR="\"$(datadir)/gnome-control-center\"" \
-DDATADIR="\"$(datadir)/gnome-control-center/ui/datetime\""
LIBS = $(INITIAL_SETUP_LIBS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]