summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2014-01-27 16:07:42 -0500
committerRay Strode <rstrode@redhat.com>2014-01-27 16:07:42 -0500
commit05cd44de24c0b81b88e41f3fa9e78159f701e033 (patch)
tree4ddf2347a6233539f26517acaebd523d275bf982 /data
parented7b9505a4f8ea90f0bf540b5ed8c24d9ffd66ad (diff)
downloadgdm-05cd44de24c0b81b88e41f3fa9e78159f701e033.tar.gz
Revert "data: removing 'workingdir' dconf manipulations"
This reverts commit d74c93a2d2c3e88ec8fc0765edac8722bd57408d.
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.am20
1 files changed, 20 insertions, 0 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 313eb9f9..c61ca589 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -11,6 +11,7 @@ initdir = $(gdmconfdir)/Init
postdir = $(gdmconfdir)/PostSession
predir = $(gdmconfdir)/PreSession
postlogindir = $(gdmconfdir)/PostLogin
+workingdir = $(GDM_WORKING_DIR)
xauthdir = $(GDM_XAUTH_DIR)
screenshotdir = $(GDM_SCREENSHOT_DIR)
cachedir = $(localstatedir)/cache/gdm
@@ -214,6 +215,7 @@ uninstall-hook:
$(DESTDIR)$(sysconfdir)/dconf/db/gdm \
$(DESTDIR)$(sysconfdir)/dconf/profile/gdm \
-rf \
+ $(DESTDIR)$(workingdir)/.config/dconf \
$(DESTDIR)$(screenshotdir) \
$(DESTDIR)$(xauthdir) \
$(DESTDIR)$(PAM_PREFIX)/pam.d
@@ -311,6 +313,24 @@ install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession $(system
chown gdm:gdm $(DESTDIR)$(screenshotdir) || : ; \
fi
+ if test '!' -d $(DESTDIR)$(workingdir); then \
+ $(mkinstalldirs) $(DESTDIR)$(workingdir); \
+ chmod 1770 $(DESTDIR)$(workingdir); \
+ chown root:gdm $(DESTDIR)$(workingdir) || : ; \
+ fi
+
+ if test '!' -d $(DESTDIR)$(workingdir)/.config/dconf; then \
+ $(mkinstalldirs) $(DESTDIR)$(workingdir)/.config/dconf; \
+ chmod 0755 $(DESTDIR)$(workingdir)/.config/dconf; \
+ chown gdm:gdm $(DESTDIR)$(workingdir)/.config/dconf || : ; \
+ fi
+
+ if test '!' -d $(DESTDIR)$(workingdir)/.local/share/applications; then \
+ $(mkinstalldirs) $(DESTDIR)$(workingdir)/.local/share/applications; \
+ chmod 0755 $(DESTDIR)$(workingdir)/.local/share/applications; \
+ chown gdm:gdm $(DESTDIR)$(workingdir)/.local/share/applications || : ; \
+ fi
+
if test '!' -d $(DESTDIR)$(cachedir); then \
$(mkinstalldirs) $(DESTDIR)$(cachedir); \
chmod 1755 $(DESTDIR)$(cachedir); \