diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2006-11-06 14:08:15 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2006-11-06 14:08:15 -0800 |
| commit | 37f9293e3cc00411d8d335ce729d18995bb9ce59 (patch) | |
| tree | e80e25ab1b0a300370b29b3db12e751134951488 | |
| parent | 0e0221a70543ba5f2aa7ce188e2dc9544bac96bd (diff) | |
Fill in paths at build time in Xreset & Xstartup
Stop hardcoding /usr/X11R6/bin/sessreg and instead fill in paths like other
config files from directories passed via configure.
| -rw-r--r-- | config/Makefile.am | 10 | ||||
| -rw-r--r-- | config/Xreset | 5 | ||||
| -rw-r--r-- | config/Xreset.cpp | 5 | ||||
| -rw-r--r-- | config/Xstartup | 5 | ||||
| -rw-r--r-- | config/Xstartup.cpp | 5 |
5 files changed, 15 insertions, 15 deletions
diff --git a/config/Makefile.am b/config/Makefile.am index 36410f4..ae4a690 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -15,26 +15,26 @@ xdmconfig_DATA = \ Xservers xdmscript_SCRIPTS = \ - Xsession + Xreset \ + Xsession \ + Xstartup dist_xdmscript_SCRIPTS = \ GiveConsole \ TakeConsole \ Xsetup_0 \ - Xstartup \ - Xreset \ Xwilling pixmapdir = $(XDM_PIXMAPDIR) dist_pixmap_DATA = xorg-bw.xpm xorg.xpm -BUILT_SOURCES = Xservers.ws xdm-config Xresources Xsession +BUILT_SOURCES = Xservers.ws xdm-config Xreset Xresources Xsession Xstartup CLEANFILES = $(BUILT_SOURCES) Xservers EXTRA_DIST = Xservers.ws.cpp Xservers.fs \ - xdm-config.cpp Xresources.cpp Xsession.cpp + xdm-config.cpp Xreset.cpp Xresources.cpp Xsession.cpp Xstartup.cpp Xservers: Xservers.$(SERVERSTYPE) ln -s Xservers.$(SERVERSTYPE) Xservers diff --git a/config/Xreset b/config/Xreset deleted file mode 100644 index d89d237..0000000 --- a/config/Xreset +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -# Deregister a login. (Derived from TakeConsole as follows:) -# -/usr/X11R6/bin/sessreg -d -w "/var/log/wtmp" -u "/var/run/utmp" \ - -x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER diff --git a/config/Xreset.cpp b/config/Xreset.cpp new file mode 100644 index 0000000..8f4ef19 --- /dev/null +++ b/config/Xreset.cpp @@ -0,0 +1,5 @@ +XCOMM!/bin/sh +XCOMM Deregister a login. (Derived from TakeConsole as follows:) +XCOMM +BINDIR/sessreg -d -w "/var/log/wtmp" -u "/var/run/utmp" \ + -x "XDMCONFIGDIR/Xservers" -l $DISPLAY -h "" $USER diff --git a/config/Xstartup b/config/Xstartup deleted file mode 100644 index 4929f41..0000000 --- a/config/Xstartup +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -# Register a login (derived from GiveConsole as follows:) -# -/usr/X11R6/bin/sessreg -a -w "/var/log/wtmp" -u "/var/run/utmp" \ - -x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER diff --git a/config/Xstartup.cpp b/config/Xstartup.cpp new file mode 100644 index 0000000..a3f3f9e --- /dev/null +++ b/config/Xstartup.cpp @@ -0,0 +1,5 @@ +XCOMM!/bin/sh +XCOMM Register a login (derived from GiveConsole as follows:) +XCOMM +BINDIR/sessreg -a -w "/var/log/wtmp" -u "/var/run/utmp" \ + -x "XDMCONFIGDIR/Xservers" -l $DISPLAY -h "" $USER |