diff options
| author | Ray Strode <rstrode@redhat.com> | 2009-10-27 10:40:55 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2009-11-05 15:40:43 -0500 |
| commit | 0596fa2d91760bca520b549dbcfc35bdc98ee098 (patch) | |
| tree | ddd680dc2fdbe6f259823a3f2e0afa9363eaf2ed | |
| parent | 650175fc87de19bb150e38e3adb0f5a0a373369c (diff) | |
| download | gdm-0596fa2d91760bca520b549dbcfc35bdc98ee098.tar.gz | |
Make screenshot dir a configure argument
This provides a little more flexibility to distributors,
but more importantly makes it less hard coded in gdm-screenshot.c
| -rw-r--r-- | configure.ac | 17 | ||||
| -rw-r--r-- | data/Makefile.am | 8 | ||||
| -rw-r--r-- | utils/Makefile.am | 1 | ||||
| -rw-r--r-- | utils/gdm-screenshot.c | 5 |
4 files changed, 27 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 4fe44301..0dd26584 100644 --- a/configure.ac +++ b/configure.ac @@ -1237,6 +1237,23 @@ fi AC_SUBST(GDM_XAUTH_DIR) dnl --------------------------------------------------------------------------- +dnl - Directory for greeter screenshot +dnl --------------------------------------------------------------------------- + +AC_ARG_WITH(screenshot-dir, + AS_HELP_STRING([--with-screenshot-dir=<dir>], + [directory to store greeter screenshot])) + +if ! test -z "$with_screenshot_dir"; then + GDM_SCREENSHOT_DIR=$with_screenshot_dir +else + GDM_SCREENSHOT_DIR=${localstatedir}/run/gdm +fi + +AC_SUBST(GDM_SCREENSHOT_DIR) + + +dnl --------------------------------------------------------------------------- dnl - Finish dnl --------------------------------------------------------------------------- diff --git a/data/Makefile.am b/data/Makefile.am index 73fa1062..608194d7 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -13,6 +13,7 @@ predir = $(gdmconfdir)/PreSession postlogindir = $(gdmconfdir)/PostLogin workingdir = $(GDM_WORKING_DIR) xauthdir = $(GDM_XAUTH_DIR) +screenshotdir = $(GDM_SCREENSHOT_DIR) cachedir = $(localstatedir)/cache/gdm Xsession: $(srcdir)/Xsession.in @@ -123,6 +124,7 @@ uninstall-hook: -rf \ $(DESTDIR)$(workingdir)/.gconf.mandatory \ $(DESTDIR)$(xauthdir) + $(DESTDIR)$(screenshotdir) install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession gconf.path if test '!' -d $(DESTDIR)$(gdmconfdir); then \ @@ -204,6 +206,12 @@ install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession gconf.pa chown root:gdm $(DESTDIR)$(xauthdir) || : ; \ fi + if test '!' -d $(DESTDIR)$(screenshotdir); then \ + $(mkinstalldirs) $(DESTDIR)$(screenshotdir); \ + chmod 0755 $(DESTDIR)$(screenshotdir); \ + chown gdm:gdm $(DESTDIR)$(screenshotdir) || : ; \ + fi + if test '!' -d $(DESTDIR)$(workingdir); then \ $(mkinstalldirs) $(DESTDIR)$(workingdir); \ chmod 1770 $(DESTDIR)$(workingdir); \ diff --git a/utils/Makefile.am b/utils/Makefile.am index 0b6ea049..f1ff3313 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -4,6 +4,7 @@ AM_CPPFLAGS = \ -I. \ -I.. \ -DLOCALSTATEDIR=\""$(localstatedir)"\" \ + -DGDM_SCREENSHOT_DIR=\""$(GDM_SCREENSHOT_DIR)"\"\ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ $(UTILS_CFLAGS) \ $(CANBERRA_GTK_CFLAGS) \ diff --git a/utils/gdm-screenshot.c b/utils/gdm-screenshot.c index f66de460..12102f2a 100644 --- a/utils/gdm-screenshot.c +++ b/utils/gdm-screenshot.c @@ -163,11 +163,8 @@ screenshot_save (GdkPixbuf *pixbuf) char *filename; gboolean res; GError *error; - const char *save_dir; - save_dir = LOCALSTATEDIR "/run/gdm"; - - filename = g_build_filename (save_dir, + filename = g_build_filename (GDM_SCREENSHOT_DIR, "GDM-Screenshot.png", NULL); |