Commit 0af90fae authored by Ray Strode's avatar Ray Strode Committed by Ray Strode

Fix make distcheck

2007-11-19  Ray Strode  <rstrode@redhat.com>

	Fix make distcheck

	* acconfig.h: add HAVE_LOG{IN,OUT,WTMP}
	* data/Makefile.am: uninstall pam and gconf files
	in uninstall-hook. fix builddir != srcdir issues

svn path=/trunk/; revision=5518
parent 5c85ed01
2007-11-19 Ray Strode <rstrode@redhat.com>
Fix make distcheck
* acconfig.h: add HAVE_LOG{IN,OUT,WTMP}
* data/Makefile.am: uninstall pam and gconf files
in uninstall-hook. fix builddir != srcdir issues
2007-11-19 Ray Strode <rstrode@redhat.com>
* data/Makefile.am:
......
......@@ -50,3 +50,7 @@
#undef X_PATH
#undef XSESSION_SHELL
#undef XEVIE_OPTION
#undef HAVE_LOGIN
#undef HAVE_LOGOUT
#undef HAVE_LOGWTMP
......@@ -109,7 +109,12 @@ uninstall-hook:
$(DESTDIR)$(initdir)/Default \
$(DESTDIR)$(postlogindir)/Default.sample \
$(DESTDIR)$(predir)/Default \
$(DESTDIR)$(postdir)/Default
$(DESTDIR)$(postdir)/Default \
$(DESTDIR)$(PAM_PREFIX)/pam.d/gdm \
$(DESTDIR)$(PAM_PREFIX)/pam.d/gdm-autologin \
$(DESTDIR)$(workingdir)/.gconf.path \
-rf \
$(DESTDIR)$(workingdir)/.gconf.mandatory
install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession gconf.path
if test '!' -d $(DESTDIR)$(gdmconfdir); then \
......@@ -175,10 +180,10 @@ install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession gconf.pa
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; \
$(INSTALL_DATA) $(srcdir)/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; \
$(INSTALL_DATA) $(srcdir)/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!"; \
......@@ -191,8 +196,8 @@ install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession gconf.pa
chown root:gdm $(DESTDIR)$(workingdir) || : ; \
fi
$(INSTALL_DATA) gconf.path $(DESTDIR)$(workingdir)/.gconf.path
gconftool-2 --direct --config-source=xml:merged:$(DESTDIR)$(workingdir)/.gconf.mandatory --load session-setup.entries
$(INSTALL_DATA) $(srcdir)/gconf.path $(DESTDIR)$(workingdir)/.gconf.path
gconftool-2 --direct --config-source=xml:merged:$(DESTDIR)$(workingdir)/.gconf.mandatory --load $(srcdir)/session-setup.entries
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment