Revert "move over to using 'dconf compile' and file-db"

This reverts commit 766d07bd1b6aa1c0e631676ad6b6a983d46624f2.

8 files changed, 43 insertions, 20 deletions

diff --git a/configure.ac b/configure.ac
index 884b94aa..75f29f7e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1569,7 +1569,6 @@ data/pixmaps/Makefile
 data/pixmaps/16x16/Makefile
 data/pixmaps/32x32/Makefile
 data/pixmaps/48x48/Makefile
-data/dconf-profile/gdm
 common/Makefile
 po/Makefile.in
 tests/Makefile
diff --git a/data/.gitignore b/data/.gitignore
index c95bb397..d9c62cb1 100644
--- a/data/.gitignore
+++ b/data/.gitignore
@@ -1,2 +1 @@
 /gdm.service
-/greeter-dconf-defaults
diff --git a/data/dconf-settings/00-upstream-settings b/data/00-upstream-settings
index 24a7715e..24a7715e 100644
--- a/data/dconf-settings/00-upstream-settings
+++ b/data/00-upstream-settings
diff --git a/data/dconf-settings/locks/00-upstream-settings-locks b/data/00-upstream-settings-locks
index 830a729c..830a729c 100644
--- a/data/dconf-settings/locks/00-upstream-settings-locks
+++ b/data/00-upstream-settings-locks
diff --git a/data/Makefile.am b/data/Makefile.am
index c61ca589..d725faa8 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -43,18 +43,6 @@ dbusconf_DATA = $(dbusconf_in_files:.conf.in=.conf)
 @INTLTOOL_SCHEMAS_RULE@
 @INTLTOOL_XML_NOMERGE_RULE@
 
-# dconf database and profile
-dconf_db_files = \
-	dconf-settings/00-upstream-settings		\
-	dconf-settings/locks/00-upstream-settings-locks
-
-pkgdata_DATA = greeter-dconf-defaults
-greeter-dconf-defaults: $(dconf_db_files)
-	$(AM_V_GEN) dconf compile $@ $(srcdir)/dconf-settings
-
-dconfprofiledir = $(DATADIR)/dconf/profile
-dconfprofile_DATA = dconf-profile/gdm
-
 gsettings_SCHEMAS = org.gnome.login-screen.gschema.xml
 @GSETTINGS_RULES@
 
@@ -153,7 +141,6 @@ pam_files = $(pam_lfs_files)
 endif
 
 EXTRA_DIST +=			\
-	$(dconf_db_files)	\
 	$(schemas_in_files)	\
 	$(schemas_DATA)		\
 	$(dbusconf_in_files)	\
@@ -165,6 +152,9 @@ EXTRA_DIST +=			\
 	PreSession.in 		\
 	PostSession.in 		\
 	PostLogin 		\
+	dconf-profile \
+	00-upstream-settings \
+	00-upstream-settings-locks \
 	org.gnome.login-screen.gschema.xml.in \
 	$(NULL)
 
@@ -175,7 +165,6 @@ CLEANFILES = 				\
 	PreSession			\
 	PostSession			\
 	$(gsettings_SCHEMAS)		\
-	greeter-dconf-defaults		\
 	$(NULL)
 
 DISTCLEANFILES =			\
@@ -215,18 +204,25 @@ uninstall-hook:
 	$(DESTDIR)$(sysconfdir)/dconf/db/gdm \
 	$(DESTDIR)$(sysconfdir)/dconf/profile/gdm \
 	-rf \
+	$(DESTDIR)$(sysconfdir)/dconf/db/gdm.d \
 	$(DESTDIR)$(workingdir)/.config/dconf \
 	$(DESTDIR)$(screenshotdir) \
 	$(DESTDIR)$(xauthdir) \
 	$(DESTDIR)$(PAM_PREFIX)/pam.d
 
+	-rmdir \
+	$(DESTDIR)$(sysconfdir)/dconf/db/gdm.d/locks \
+	$(DESTDIR)$(sysconfdir)/dconf/db/gdm.d \
+	$(DESTDIR)$(sysconfdir)/dconf/db \
+	$(DESTDIR)$(sysconfdir)/dconf
+
 	if test -n "$(systemdsystemunit)"; then \
 		rm -f $(DESTDIR)$(SYSTEMD_SYSTEM_UNIT_DIR)/$(systemdsystemunit); \
 		rmdir $(DESTDIR)$(SYSTEMD_SYSTEM_UNIT_DIR) || : ; \
 	fi
 
 
-install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession $(systemdsystemunit)
+install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession 00-upstream-settings 00-upstream-settings-locks $(systemdsystemunit)
 	if test '!' -d $(DESTDIR)$(gdmconfdir); then \
 		$(mkinstalldirs) $(DESTDIR)$(gdmconfdir); \
 		chmod 755 $(DESTDIR)$(gdmconfdir); \
@@ -331,8 +327,38 @@ install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession $(system
 		chown gdm:gdm $(DESTDIR)$(workingdir)/.local/share/applications || : ; \
 	fi
 
+	if test '!' -d $(DESTDIR)$(sysconfdir)/dconf/profile; then \
+		$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/dconf/profile; \
+		chmod 0755 $(DESTDIR)$(sysconfdir)/dconf/profile; \
+		chown root:root $(DESTDIR)$(sysconfdir)/dconf/profile || : ; \
+	fi
+
+	if test '!' -d $(DESTDIR)$(sysconfdir)/dconf/db; then \
+		$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/dconf/db; \
+		chmod 0755 $(DESTDIR)$(sysconfdir)/dconf/db; \
+		chown root:root $(DESTDIR)$(sysconfdir)/dconf/db || : ; \
+	fi
+
+	if test '!' -d $(DESTDIR)$(sysconfdir)/dconf/db/gdm.d; then \
+		$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/dconf/db/gdm.d; \
+		chmod 0755 $(DESTDIR)$(sysconfdir)/dconf/db/gdm.d; \
+		chown root:root $(DESTDIR)$(sysconfdir)/dconf/db/gdm.d || : ; \
+	fi
+
+	if test '!' -d $(DESTDIR)$(sysconfdir)/dconf/db/gdm.d/locks; then \
+		$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/dconf/db/gdm.d/locks; \
+		chmod 0755 $(DESTDIR)$(sysconfdir)/dconf/db/gdm.d/locks; \
+		chown root:root $(DESTDIR)$(sysconfdir)/dconf/db/gdm.d/locks || : ; \
+	fi
+
 	if test '!' -d $(DESTDIR)$(cachedir); then \
 		$(mkinstalldirs) $(DESTDIR)$(cachedir); \
 		chmod 1755 $(DESTDIR)$(cachedir); \
 		chown root:gdm $(DESTDIR)$(cachedir) || : ; \
 	fi
+
+	$(INSTALL_DATA) $(srcdir)/dconf-profile $(DESTDIR)$(sysconfdir)/dconf/profile/gdm
+	$(INSTALL_DATA) $(srcdir)/00-upstream-settings $(DESTDIR)$(sysconfdir)/dconf/db/gdm.d
+	$(INSTALL_DATA) $(srcdir)/00-upstream-settings-locks $(DESTDIR)$(sysconfdir)/dconf/db/gdm.d/locks
+	test -z "$(DESTDIR)" && dconf update || :
+
diff --git a/data/dconf-profile b/data/dconf-profile
new file mode 100644
index 00000000..e4ac2200
--- /dev/null
+++ b/data/dconf-profile
@@ -0,0 +1,2 @@
+user-db:user
+system-db:gdm
diff --git a/data/dconf-profile/.gitignore b/data/dconf-profile/.gitignore
deleted file mode 100644
index f0047b3f..00000000
--- a/data/dconf-profile/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/gdm
diff --git a/data/dconf-profile/gdm.in b/data/dconf-profile/gdm.in
deleted file mode 100644
index 4d8bf174..00000000
--- a/data/dconf-profile/gdm.in
+++ /dev/null
@@ -1,2 +0,0 @@
-user-db:user
-file-db:@DATADIR@/@PACKAGE@/greeter-dconf-defaults