Attachment 3803 Details for Bug 5055 – fix to install into the right location

[patch] fix to install into the right location

xdm-0.99.3-xdm-configdir.patch (text/plain), 7.67 KB, created by Jeremy Katz on 2005-11-15 09:45:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Katz

Created: 2005-11-15 09:45:24 UTC

Size: 7.67 KB

patch

obsolete

>--- xdm-0.99.3/config/Makefile.in.xdmconfig	2005-11-09 20:34:34.000000000 -0500
>+++ xdm-0.99.3/config/Makefile.in	2005-11-14 15:36:12.000000000 -0500
>@@ -228,11 +228,11 @@
> 	Xservers
> 
> 
>-xdmlib_SCRIPTS = \
>+xdmconfig_SCRIPTS = \
> 	Xsession
> 
> 
>-dist_xdmlib_SCRIPTS = \
>+dist_xdmconfig_SCRIPTS = \
> 	GiveConsole \
> 	TakeConsole \
> 	Xsetup_0 \
>@@ -272,13 +272,13 @@
> mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
> CONFIG_HEADER = $(top_builddir)/config.h
> CONFIG_CLEAN_FILES =
>-SCRIPTS = $(dist_xdmlib_SCRIPTS) $(xdmlib_SCRIPTS)
>+SCRIPTS = $(dist_xdmconfig_SCRIPTS) $(xdmconfig_SCRIPTS)
> 
> DIST_SOURCES =
> DATA = $(dist_pixmap_DATA) $(dist_xdmconfig_DATA) $(xdmconfig_DATA)
> 
> DIST_COMMON = README $(dist_pixmap_DATA) $(dist_xdmconfig_DATA) \
>-	$(dist_xdmlib_SCRIPTS) $(srcdir)/Makefile.in \
>+	$(dist_xdmconfig_SCRIPTS) $(srcdir)/Makefile.in \
> 	$(top_srcdir)/cpprules.in Makefile.am
> all: $(BUILT_SOURCES)
> 	$(MAKE) $(AM_MAKEFLAGS) all-am
>@@ -290,45 +290,45 @@
> 	  $(AUTOMAKE) --gnu  config/Makefile
> Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
> 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
>-dist_xdmlibSCRIPT_INSTALL = $(INSTALL_SCRIPT)
>-install-dist_xdmlibSCRIPTS: $(dist_xdmlib_SCRIPTS)
>+dist_xdmconfigSCRIPT_INSTALL = $(INSTALL_SCRIPT)
>+install-dist_xdmconfigSCRIPTS: $(dist_xdmconfig_SCRIPTS)
> 	@$(NORMAL_INSTALL)
>-	$(mkinstalldirs) $(DESTDIR)$(xdmlibdir)
>-	@list='$(dist_xdmlib_SCRIPTS)'; for p in $$list; do \
>+	$(mkinstalldirs) $(DESTDIR)$(xdmconfigdir)
>+	@list='$(dist_xdmconfig_SCRIPTS)'; for p in $$list; do \
> 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
> 	  if test -f $$d$$p; then \
> 	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
>-	    echo " $(dist_xdmlibSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(xdmlibdir)/$$f"; \
>-	    $(dist_xdmlibSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(xdmlibdir)/$$f; \
>+	    echo " $(dist_xdmconfigSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(xdmconfigdir)/$$f"; \
>+	    $(dist_xdmconfigSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(xdmconfigdir)/$$f; \
> 	  else :; fi; \
> 	done
> 
>-uninstall-dist_xdmlibSCRIPTS:
>+uninstall-dist_xdmconfigSCRIPTS:
> 	@$(NORMAL_UNINSTALL)
>-	@list='$(dist_xdmlib_SCRIPTS)'; for p in $$list; do \
>+	@list='$(dist_xdmconfig_SCRIPTS)'; for p in $$list; do \
> 	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
>-	  echo " rm -f $(DESTDIR)$(xdmlibdir)/$$f"; \
>-	  rm -f $(DESTDIR)$(xdmlibdir)/$$f; \
>+	  echo " rm -f $(DESTDIR)$(xdmconfigdir)/$$f"; \
>+	  rm -f $(DESTDIR)$(xdmconfigdir)/$$f; \
> 	done
>-xdmlibSCRIPT_INSTALL = $(INSTALL_SCRIPT)
>-install-xdmlibSCRIPTS: $(xdmlib_SCRIPTS)
>+xdmconfigSCRIPT_INSTALL = $(INSTALL_SCRIPT)
>+install-xdmconfigSCRIPTS: $(xdmconfig_SCRIPTS)
> 	@$(NORMAL_INSTALL)
>-	$(mkinstalldirs) $(DESTDIR)$(xdmlibdir)
>-	@list='$(xdmlib_SCRIPTS)'; for p in $$list; do \
>+	$(mkinstalldirs) $(DESTDIR)$(xdmconfigdir)
>+	@list='$(xdmconfig_SCRIPTS)'; for p in $$list; do \
> 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
> 	  if test -f $$d$$p; then \
> 	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
>-	    echo " $(xdmlibSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(xdmlibdir)/$$f"; \
>-	    $(xdmlibSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(xdmlibdir)/$$f; \
>+	    echo " $(xdmconfigSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(xdmconfigdir)/$$f"; \
>+	    $(xdmconfigSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(xdmconfigdir)/$$f; \
> 	  else :; fi; \
> 	done
> 
>-uninstall-xdmlibSCRIPTS:
>+uninstall-xdmconfigSCRIPTS:
> 	@$(NORMAL_UNINSTALL)
>-	@list='$(xdmlib_SCRIPTS)'; for p in $$list; do \
>+	@list='$(xdmconfig_SCRIPTS)'; for p in $$list; do \
> 	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
>-	  echo " rm -f $(DESTDIR)$(xdmlibdir)/$$f"; \
>-	  rm -f $(DESTDIR)$(xdmlibdir)/$$f; \
>+	  echo " rm -f $(DESTDIR)$(xdmconfigdir)/$$f"; \
>+	  rm -f $(DESTDIR)$(xdmconfigdir)/$$f; \
> 	done
> 
> mostlyclean-libtool:
>@@ -439,7 +439,7 @@
> all-am: Makefile $(SCRIPTS) $(DATA)
> 
> installdirs:
>-	$(mkinstalldirs) $(DESTDIR)$(xdmlibdir) $(DESTDIR)$(xdmlibdir) $(DESTDIR)$(pixmapdir) $(DESTDIR)$(xdmconfigdir) $(DESTDIR)$(xdmconfigdir)
>+	$(mkinstalldirs) $(DESTDIR)$(xdmconfigdir) $(DESTDIR)$(xdmconfigdir) $(DESTDIR)$(pixmapdir) $(DESTDIR)$(xdmconfigdir) $(DESTDIR)$(xdmconfigdir)
> install: $(BUILT_SOURCES)
> 	$(MAKE) $(AM_MAKEFLAGS) install-am
> install-exec: install-exec-am
>@@ -484,8 +484,8 @@
> info-am:
> 
> install-data-am: install-dist_pixmapDATA install-dist_xdmconfigDATA \
>-	install-dist_xdmlibSCRIPTS install-xdmconfigDATA \
>-	install-xdmlibSCRIPTS
>+	install-dist_xdmconfigSCRIPTS install-xdmconfigDATA \
>+	install-xdmconfigSCRIPTS
> 
> install-exec-am:
> 
>@@ -512,23 +512,23 @@
> ps-am:
> 
> uninstall-am: uninstall-dist_pixmapDATA uninstall-dist_xdmconfigDATA \
>-	uninstall-dist_xdmlibSCRIPTS uninstall-info-am \
>-	uninstall-xdmconfigDATA uninstall-xdmlibSCRIPTS
>+	uninstall-dist_xdmconfigSCRIPTS uninstall-info-am \
>+	uninstall-xdmconfigDATA uninstall-xdmconfigSCRIPTS
> 
> .PHONY: all all-am check check-am clean clean-generic clean-libtool \
> 	distclean distclean-generic distclean-libtool distdir dvi \
> 	dvi-am info info-am install install-am install-data \
> 	install-data-am install-dist_pixmapDATA \
>-	install-dist_xdmconfigDATA install-dist_xdmlibSCRIPTS \
>+	install-dist_xdmconfigDATA install-dist_xdmconfigSCRIPTS \
> 	install-exec install-exec-am install-info install-info-am \
> 	install-man install-strip install-xdmconfigDATA \
>-	install-xdmlibSCRIPTS installcheck installcheck-am installdirs \
>-	maintainer-clean maintainer-clean-generic mostlyclean \
>-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
>-	uninstall uninstall-am uninstall-dist_pixmapDATA \
>-	uninstall-dist_xdmconfigDATA uninstall-dist_xdmlibSCRIPTS \
>+	install-xdmconfigSCRIPTS installcheck installcheck-am \
>+	installdirs maintainer-clean maintainer-clean-generic \
>+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
>+	ps ps-am uninstall uninstall-am uninstall-dist_pixmapDATA \
>+	uninstall-dist_xdmconfigDATA uninstall-dist_xdmconfigSCRIPTS \
> 	uninstall-info-am uninstall-xdmconfigDATA \
>-	uninstall-xdmlibSCRIPTS
>+	uninstall-xdmconfigSCRIPTS
> 
> 
> .cpp:
>--- xdm-0.99.3/config/Makefile.am.xdmconfig	2005-11-08 02:50:12.000000000 -0500
>+++ xdm-0.99.3/config/Makefile.am	2005-11-14 15:36:10.000000000 -0500
>@@ -14,10 +14,10 @@
> 	Xresources \
> 	Xservers
> 
>-xdmlib_SCRIPTS = \
>+xdmconfig_SCRIPTS = \
> 	Xsession
> 
>-dist_xdmlib_SCRIPTS = \
>+dist_xdmconfig_SCRIPTS = \
> 	GiveConsole \
> 	TakeConsole \
> 	Xsetup_0 \
>--- xdm-0.99.3/config/xdm-config.cpp.xdmconfig	2005-11-14 15:38:20.000000000 -0500
>+++ xdm-0.99.3/config/xdm-config.cpp	2005-11-14 15:38:50.000000000 -0500
>@@ -15,21 +15,21 @@
> DisplayManager.servers:		XDMCONFIGDIR/Xservers
> DisplayManager.accessFile:	XDMCONFIGDIR/Xaccess
> DisplayManager*resources:	XDMCONFIGDIR/Xresources
>-DisplayManager.willing:		SU nobody -s /bin/bash XDMDIR/Xwilling
>+DisplayManager.willing:		SU nobody -s /bin/bash XDMCONFIGDIR/Xwilling
> ! All displays should use authorization, but we cannot be sure
> ! X terminals may not be configured that way, so they will require
> ! individual resource settings.
> DisplayManager*authorize:	true
> !
> DisplayManager*chooser:		CHOOSERPATH
>-DisplayManager*startup:		XDMDIR/Xstartup
>-DisplayManager*session:		XDMDIR/Xsession
>-DisplayManager*reset:		XDMDIR/Xreset
>+DisplayManager*startup:		XDMCONFIGDIR/Xstartup
>+DisplayManager*session:		XDMCONFIGDIR/Xsession
>+DisplayManager*reset:		XDCONFIGMDIR/Xreset
> DisplayManager*authComplain:	true
> ! The following three resources set up display :0 as the console.
>-DisplayManager._0.setup:	XDMDIR/Xsetup_0
>-DisplayManager._0.startup:	XDMDIR/GiveConsole
>-DisplayManager._0.reset:	XDMDIR/TakeConsole
>+DisplayManager._0.setup:	XDMCONFIGDIR/Xsetup_0
>+DisplayManager._0.startup:	XDMCONFIGDIR/GiveConsole
>+DisplayManager._0.reset:	XDMCONFIGDIR/TakeConsole
> #ifdef XPM
> DisplayManager*loginmoveInterval:	10
> #endif /* XPM */

Actions: View | Splinter Review

Attachments on bug 5055: 3803

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.