diff options
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | config/Makefile.am | 164 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | data/Init.in (renamed from config/Init.in) | 2 | ||||
| -rw-r--r-- | data/Makefile.am | 134 | ||||
| -rwxr-xr-x | data/PostLogin (renamed from config/PostLogin) | 0 | ||||
| -rwxr-xr-x | data/PostSession.in (renamed from config/PostSession.in) | 2 | ||||
| -rwxr-xr-x | data/PreSession.in (renamed from config/PreSession.in) | 4 | ||||
| -rwxr-xr-x | data/Xsession.in (renamed from config/Xsession.in) | 0 | ||||
| -rw-r--r-- | data/gdm (renamed from config/gdm) | 0 | ||||
| -rw-r--r-- | data/gdm-autologin (renamed from config/gdm-autologin) | 0 | ||||
| -rw-r--r-- | data/gdm.conf-custom.in (renamed from config/gdm.conf-custom.in) | 0 |
12 files changed, 148 insertions, 177 deletions
@@ -1,5 +1,20 @@ 2007-11-01 William Jon McCann <mccann@jhu.edu> + * config/Init.in: + * config/Makefile.am: + * config/PostLogin: + * config/PostSession.in: + * config/PreSession.in: + * config/Xsession.in: + * config/gdm: + * config/gdm-autologin: + * config/gdm.conf-custom.in: + * configure.ac: + * data/Makefile.am: + Move stuff from config to data. + +2007-11-01 William Jon McCann <mccann@jhu.edu> + * config/Makefile.am: * config/gdm.conf-custom.in: * config/gdm.conf.in: diff --git a/config/Makefile.am b/config/Makefile.am deleted file mode 100644 index 33b5872c..00000000 --- a/config/Makefile.am +++ /dev/null @@ -1,164 +0,0 @@ -NULL = - -confdir = $(gdmconfdir) -instsessdir = $(datadir)/xsessions -initdir = $(gdmconfdir)/Init -authdir = $(localstatedir)/gdm -postdir = $(gdmconfdir)/PostSession -predir = $(gdmconfdir)/PreSession -postlogindir = $(gdmconfdir)/PostLogin -# logdir is set by configure.ac - -noinst_DATA = \ - gdm.conf \ - $(NULL) - -EXTRA_DIST = \ - gdm.conf-custom.in \ - Xsession.in \ - gdm \ - gdm-autologin \ - Init.in \ - PreSession.in \ - PostSession.in \ - PostLogin \ - $(NULL) - -CLEANFILES = \ - Xsession \ - gdm.conf-custom \ - Init \ - PreSession \ - PostSession \ - $(NULL) - -Xsession: $(srcdir)/Xsession.in - sed -e 's,[@]XSESSION_SHELL[@],$(XSESSION_SHELL),g' \ - -e 's,[@]libexecdir[@],$(libexecdir),g' \ - <$(srcdir)/Xsession.in >Xsession - -gdm.conf-custom: $(srcdir)/gdm.conf-custom.in - sed -e 's,[@]GDM_DEFAULTS_CONF[@],$(GDM_DEFAULTS_CONF),g' \ - <$(srcdir)/gdm.conf-custom.in >gdm.conf-custom - -@INTLTOOL_DESKTOP_RULE@ - -uninstall-hook: - rm -f \ - $(DESTDIR)$(GDM_DEFAULTS_CONF) \ - $(DESTDIR)$(GDM_CUSTOM_CONF) \ - `dirname $(DESTDIR)$(GDM_DEFAULTS_CONF)`/factory-`basename $(DESTDIR)$(GDM_DEFAULTS_CONF)` \ - $(DESTDIR)$(confdir)/Xsession \ - $(DESTDIR)$(initdir)/Default \ - $(DESTDIR)$(postlogindir)/Default.sample \ - $(DESTDIR)$(predir)/Default \ - $(DESTDIR)$(postdir)/Default - -install-data-hook: gdm.conf gdm.conf-custom Xsession Init PostSession PreSession - if test '!' -d $(DESTDIR)$(confdir); then \ - $(mkinstalldirs) $(DESTDIR)$(confdir); \ - chmod 755 $(DESTDIR)$(confdir); \ - fi - if test '!' -d $(DESTDIR)$(dmconfdir); then \ - $(mkinstalldirs) $(DESTDIR)$(dmconfdir); \ - chmod 755 $(DESTDIR)$(dmconfdir); \ - fi - if test '!' -d `dirname $(DESTDIR)$(GDM_DEFAULTS_CONF)`; then \ - $(mkinstalldirs) `dirname $(DESTDIR)$(GDM_DEFAULTS_CONF)`; \ - chmod 755 `dirname $(DESTDIR)$(GDM_DEFAULTS_CONF)`; \ - fi - if test '!' -d `dirname $(DESTDIR)$(GDM_CUSTOM_CONF)`; then \ - $(mkinstalldirs) `dirname $(DESTDIR)$(GDM_CUSTOM_CONF)`; \ - chmod 755 `dirname $(DESTDIR)$(GDM_CUSTOM_CONF)`; \ - fi - if test -f $(DESTDIR)$(confdir)/gdm.conf; then \ - if ! cmp -s $(DESTDIR)$(confdir)/gdm.conf $(DESTDIR)$(confdir)/factory-gdm.conf > /dev/null 2>&1 ; then \ - if test '!' -f $(DESTDIR)$(GDM_CUSTOM_CONF); then \ - mv -f $(DESTDIR)$(confdir)/gdm.conf $(DESTDIR)$(GDM_CUSTOM_CONF); \ - else \ - mv -f $(DESTDIR)$(confdir)/gdm.conf $(DESTDIR)$(GDM_DEFAULTS_CONF).org; \ - fi; \ - fi; \ - fi - $(INSTALL_DATA) gdm.conf $(DESTDIR)$(GDM_DEFAULTS_CONF) - chmod 444 $(DESTDIR)$(GDM_DEFAULTS_CONF) - if test '!' -f $(DESTDIR)$(GDM_CUSTOM_CONF); then \ - $(INSTALL_DATA) gdm.conf-custom $(DESTDIR)$(GDM_CUSTOM_CONF); \ - chmod 644 $(DESTDIR)$(GDM_CUSTOM_CONF); \ - fi - $(INSTALL_DATA) gdm.conf `dirname $(DESTDIR)$(GDM_DEFAULTS_CONF)`/factory-`basename $(DESTDIR)$(GDM_DEFAULTS_CONF)` - - $(INSTALL_SCRIPT) Xsession $(DESTDIR)$(confdir)/Xsession - - if test '!' -d $(DESTDIR)$(instsessdir); then \ - $(mkinstalldirs) $(DESTDIR)$(instsessdir); \ - chmod 755 $(DESTDIR)$(instsessdir); \ - fi - - if test '!' -d $(DESTDIR)$(initdir); then \ - $(mkinstalldirs) $(DESTDIR)$(initdir); \ - chmod 755 $(DESTDIR)$(initdir); \ - fi - -if test -f $(DESTDIR)$(initdir)/Default; then \ - cp -f $(DESTDIR)$(initdir)/Default $(DESTDIR)$(initdir)/Default.orig; \ - fi - $(INSTALL_SCRIPT) Init $(DESTDIR)$(initdir)/Default - - if test '!' -d $(DESTDIR)$(postlogindir); then \ - $(mkinstalldirs) $(DESTDIR)$(postlogindir); \ - chmod 755 $(DESTDIR)$(postlogindir); \ - fi - $(INSTALL_SCRIPT) $(srcdir)/PostLogin $(DESTDIR)$(postlogindir)/Default.sample - - if test '!' -d $(DESTDIR)$(predir); then \ - $(mkinstalldirs) $(DESTDIR)$(predir); \ - chmod 755 $(DESTDIR)$(predir); \ - fi - -if test -f $(DESTDIR)$(predir)/Default; then \ - cp -f $(DESTDIR)$(predir)/Default $(DESTDIR)$(predir)/Default.orig; \ - fi - $(INSTALL_SCRIPT) PreSession $(DESTDIR)$(predir)/Default - - if test '!' -d $(DESTDIR)$(postdir); then \ - $(mkinstalldirs) $(DESTDIR)$(postdir); \ - chmod 755 $(DESTDIR)$(postdir); \ - fi - -if test -f $(DESTDIR)$(postdir)/Default; then \ - cp -f $(DESTDIR)$(postdir)/Default $(DESTDIR)$(postdir)/Default.orig; \ - fi - $(INSTALL_SCRIPT) PostSession $(DESTDIR)$(postdir)/Default - - if test '!' -d $(DESTDIR)$(gnomercdir); then \ - $(mkinstalldirs) $(DESTDIR)$(gnomercdir); \ - chmod 755 $(DESTDIR)$(gnomercdir); \ - fi - - if test '!' -d $(DESTDIR)$(logdir); then \ - $(mkinstalldirs) $(DESTDIR)$(logdir); \ - chmod 755 $(DESTDIR)$(logdir); \ - chown root:root $(DESTDIR)$(logdir) || : ; \ - fi - - if test '!' -d $(DESTDIR)$(authdir); then \ - $(mkinstalldirs) $(DESTDIR)$(authdir); \ - chmod 1770 $(DESTDIR)$(authdir); \ - chown root:gdm $(DESTDIR)$(authdir) || : ; \ - fi - - system=`uname`; \ - if test -f /usr/include/security/pam_appl.h; then \ - if test '!' -d $(DESTDIR)$(PAM_PREFIX)/pam.d; then \ - $(mkinstalldirs) $(DESTDIR)$(PAM_PREFIX)/pam.d; \ - chmod 755 $(DESTDIR)$(PAM_PREFIX)/pam.d; \ - fi; \ - if test $$system = Linux && test '!' -f $(DESTDIR)$(PAM_PREFIX)/pam.d/gdm; then \ - $(INSTALL_DATA) gdm $(DESTDIR)$(PAM_PREFIX)/pam.d/gdm; \ - fi; \ - if test $$system = Linux && test '!' -f $(DESTDIR)$(PAM_PREFIX)/pam.d/gdm-autologin; then \ - $(INSTALL_DATA) gdm-autologin $(DESTDIR)$(PAM_PREFIX)/pam.d/gdm-autologin; \ - fi; \ - if test $$system = SunOS; then \ - echo "Please add PAM authentication for gdm and gdm-autologin in $(PAM_PREFIX)/pam.conf!"; \ - fi; \ - fi - diff --git a/configure.ac b/configure.ac index 5ef870a4..f42177d3 100644 --- a/configure.ac +++ b/configure.ac @@ -1320,12 +1320,8 @@ data/pixmaps/Makefile data/pixmaps/16x16/Makefile data/pixmaps/32x32/Makefile data/pixmaps/48x48/Makefile -config/Makefile common/Makefile po/Makefile.in -config/Init -config/PreSession -config/PostSession ]) dnl --------------------------------------------------------------------------- diff --git a/config/Init.in b/data/Init.in index 5ce70c08..16ba078b 100644 --- a/config/Init.in +++ b/data/Init.in @@ -18,7 +18,7 @@ gdmwhich () { fi fi done - IFS=$OLD_IFS + IFS=$OLD_IFS echo "$OUTPUT" } diff --git a/data/Makefile.am b/data/Makefile.am index d671021b..a2269344 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -5,6 +5,32 @@ SUBDIRS = \ pixmaps \ $(NULL) +initdir = $(gdmconfdir)/Init +authdir = $(localstatedir)/gdm +postdir = $(gdmconfdir)/PostSession +predir = $(gdmconfdir)/PreSession +postlogindir = $(gdmconfdir)/PostLogin + +Xsession: $(srcdir)/Xsession.in + sed -e 's,[@]XSESSION_SHELL[@],$(XSESSION_SHELL),g' \ + -e 's,[@]libexecdir[@],$(libexecdir),g' \ + <$(srcdir)/Xsession.in >Xsession + +Init: $(srcdir)/Init.in + sed -e 's,[@]X_PATH[@],$(X_PATH),g' \ + <$(srcdir)/Init.in >Init + +PreSession: $(srcdir)/PreSession.in + sed -e 's,[@]X_PATH[@],$(X_PATH),g' \ + <$(srcdir)/PreSession.in >PreSession +PostSession: $(srcdir)/PostSession.in + sed -e 's,[@]X_PATH[@],$(X_PATH),g' \ + <$(srcdir)/PostSession.in >PostSession + +gdm.conf-custom: $(srcdir)/gdm.conf-custom.in + sed -e 's,[@]GDM_DEFAULTS_CONF[@],$(GDM_DEFAULTS_CONF),g' \ + <$(srcdir)/gdm.conf-custom.in >gdm.conf-custom + dbusconfdir = $(DBUS_SYS_DIR) dbusconf_DATA = gdm.conf @@ -42,14 +68,27 @@ gdm.schemas.in: $(srcdir)/gdm.schemas.in.in -e 's,[@]sbindir[@],$(sbindir),g' \ <$(srcdir)/gdm.schemas.in.in >gdm.schemas.in -EXTRA_DIST = \ - $(schemas_in_files) \ - $(schemas_DATA) \ - $(dbusconf_DATA) \ - gdm.schemas.in.in \ +EXTRA_DIST = \ + $(schemas_in_files) \ + $(schemas_DATA) \ + $(dbusconf_DATA) \ + gdm.schemas.in.in \ + gdm.conf-custom.in \ + Xsession.in \ + gdm \ + gdm-autologin \ + Init.in \ + PreSession.in \ + PostSession.in \ + PostLogin \ $(NULL) CLEANFILES = \ + Xsession \ + gdm.conf-custom \ + Init \ + PreSession \ + PostSession \ $(NULL) DISTCLEANFILES = \ @@ -59,3 +98,88 @@ DISTCLEANFILES = \ MAINTAINERCLEANFILES = \ *~ \ Makefile.in + + +uninstall-hook: + rm -f \ + $(DESTDIR)$(GDM_CUSTOM_CONF) \ + $(DESTDIR)$(confdir)/Xsession \ + $(DESTDIR)$(initdir)/Default \ + $(DESTDIR)$(postlogindir)/Default.sample \ + $(DESTDIR)$(predir)/Default \ + $(DESTDIR)$(postdir)/Default + +install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession + if test '!' -d $(DESTDIR)$(gdmconfdir); then \ + $(mkinstalldirs) $(DESTDIR)$(gdmconfdir); \ + chmod 755 $(DESTDIR)$(gdmconfdir); \ + fi + if test '!' -f $(DESTDIR)$(GDM_CUSTOM_CONF); then \ + $(INSTALL_DATA) gdm.conf-custom $(DESTDIR)$(GDM_CUSTOM_CONF); \ + chmod 644 $(DESTDIR)$(GDM_CUSTOM_CONF); \ + fi + + $(INSTALL_SCRIPT) Xsession $(DESTDIR)$(confdir)/Xsession + + if test '!' -d $(DESTDIR)$(initdir); then \ + $(mkinstalldirs) $(DESTDIR)$(initdir); \ + chmod 755 $(DESTDIR)$(initdir); \ + fi + -if test -f $(DESTDIR)$(initdir)/Default; then \ + cp -f $(DESTDIR)$(initdir)/Default $(DESTDIR)$(initdir)/Default.orig; \ + fi + $(INSTALL_SCRIPT) Init $(DESTDIR)$(initdir)/Default + + if test '!' -d $(DESTDIR)$(postlogindir); then \ + $(mkinstalldirs) $(DESTDIR)$(postlogindir); \ + chmod 755 $(DESTDIR)$(postlogindir); \ + fi + $(INSTALL_SCRIPT) $(srcdir)/PostLogin $(DESTDIR)$(postlogindir)/Default.sample + + if test '!' -d $(DESTDIR)$(predir); then \ + $(mkinstalldirs) $(DESTDIR)$(predir); \ + chmod 755 $(DESTDIR)$(predir); \ + fi + -if test -f $(DESTDIR)$(predir)/Default; then \ + cp -f $(DESTDIR)$(predir)/Default $(DESTDIR)$(predir)/Default.orig; \ + fi + $(INSTALL_SCRIPT) PreSession $(DESTDIR)$(predir)/Default + + if test '!' -d $(DESTDIR)$(postdir); then \ + $(mkinstalldirs) $(DESTDIR)$(postdir); \ + chmod 755 $(DESTDIR)$(postdir); \ + fi + -if test -f $(DESTDIR)$(postdir)/Default; then \ + cp -f $(DESTDIR)$(postdir)/Default $(DESTDIR)$(postdir)/Default.orig; \ + fi + $(INSTALL_SCRIPT) PostSession $(DESTDIR)$(postdir)/Default + + if test '!' -d $(DESTDIR)$(logdir); then \ + $(mkinstalldirs) $(DESTDIR)$(logdir); \ + chmod 755 $(DESTDIR)$(logdir); \ + chown root:root $(DESTDIR)$(logdir) || : ; \ + fi + + if test '!' -d $(DESTDIR)$(authdir); then \ + $(mkinstalldirs) $(DESTDIR)$(authdir); \ + chmod 1770 $(DESTDIR)$(authdir); \ + chown root:gdm $(DESTDIR)$(authdir) || : ; \ + fi + + system=`uname`; \ + if test -f /usr/include/security/pam_appl.h; then \ + if test '!' -d $(DESTDIR)$(PAM_PREFIX)/pam.d; then \ + $(mkinstalldirs) $(DESTDIR)$(PAM_PREFIX)/pam.d; \ + chmod 755 $(DESTDIR)$(PAM_PREFIX)/pam.d; \ + fi; \ + if test $$system = Linux && test '!' -f $(DESTDIR)$(PAM_PREFIX)/pam.d/gdm; then \ + $(INSTALL_DATA) gdm $(DESTDIR)$(PAM_PREFIX)/pam.d/gdm; \ + fi; \ + if test $$system = Linux && test '!' -f $(DESTDIR)$(PAM_PREFIX)/pam.d/gdm-autologin; then \ + $(INSTALL_DATA) gdm-autologin $(DESTDIR)$(PAM_PREFIX)/pam.d/gdm-autologin; \ + fi; \ + if test $$system = SunOS; then \ + echo "Please add PAM authentication for gdm and gdm-autologin in $(PAM_PREFIX)/pam.conf!"; \ + fi; \ + fi + diff --git a/config/PostLogin b/data/PostLogin index efc6394c..efc6394c 100755 --- a/config/PostLogin +++ b/data/PostLogin diff --git a/config/PostSession.in b/data/PostSession.in index ace52ecd..7c24e44c 100755 --- a/config/PostSession.in +++ b/data/PostSession.in @@ -15,7 +15,7 @@ gdmwhich () { fi fi done - IFS=$OLD_IFS + IFS=$OLD_IFS echo "$OUTPUT" } diff --git a/config/PreSession.in b/data/PreSession.in index 5ab7248a..7f444b6e 100755 --- a/config/PreSession.in +++ b/data/PreSession.in @@ -21,7 +21,7 @@ gdmwhich () { fi fi done - IFS=$OLD_IFS + IFS=$OLD_IFS echo "$OUTPUT" } @@ -44,7 +44,7 @@ if [ "x$XSETROOT" != "x" ] ; then # If we tried to load the themed backgroundcolor, but failed, then try loading plain color if [ "x$CHECKBACKCOLOR" != "xOK" ] || [ "x$GDM_GREETER_TYPE" = "xPLAIN" ]; then - # Background type can be 0=None, 1=Image & Color, 2=Color, or 3=Image + # Background type can be 0=None, 1=Image & Color, 2=Color, or 3=Image BACKTYPE=`gdmflexiserver --command="GET_CONFIG greeter/BackgroundType $DISPLAY"` # Skip if background type does not include a color diff --git a/config/Xsession.in b/data/Xsession.in index 89f88937..89f88937 100755 --- a/config/Xsession.in +++ b/data/Xsession.in diff --git a/config/gdm-autologin b/data/gdm-autologin index c4e598af..c4e598af 100644 --- a/config/gdm-autologin +++ b/data/gdm-autologin diff --git a/config/gdm.conf-custom.in b/data/gdm.conf-custom.in index 1ea316ca..1ea316ca 100644 --- a/config/gdm.conf-custom.in +++ b/data/gdm.conf-custom.in |