summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2009-07-29 11:16:29 -0700
committerAlan Coopersmith <alan.coopersmith@sun.com>2009-07-29 11:16:29 -0700
commita9040b281062ddabcfb2cfdfc37e431b047531b2 (patch)
tree42fd4fb262ebf9f8da5912a4242a8842711fcd27 /config
parentcafa4376f4761c2d565b2c1deeb7dbfb553d7045 (diff)
Set utmp/wtmp paths via configure instead of hardcoding them
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Diffstat (limited to 'config')
-rw-r--r--config/Makefile.am1
-rw-r--r--config/Xreset.cpp2
-rw-r--r--config/Xstartup.cpp2
3 files changed, 3 insertions, 2 deletions
diff --git a/config/Makefile.am b/config/Makefile.am
index 86eb0b3..7682725 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -50,6 +50,7 @@ MKTEMP_DEFINES = -DMKTEMP_COMMAND=$(MKTEMP_COMMAND)
#endif
CPP_FILES_FLAGS = -DBINDIR="$(bindir)" -DDEFAULTVT="$(DEFAULTVT)" \
+ -DUTMP_FILE="$(UTMP_FILE)" -DWTMP_FILE="$(WTMP_FILE)" \
-DXDMDIR="$(XDMLIBDIR)" -DXDMLOGDIR="$(XDMLOGDIR)" \
-DXDMXAUTHDIR="$(XDMXAUTHDIR)" \
-DXDMPIDDIR="$(XDMPIDDIR)" -DXDMCONFIGDIR="$(XDMCONFIGDIR)" \
diff --git a/config/Xreset.cpp b/config/Xreset.cpp
index d64df0d..321cd89 100644
--- a/config/Xreset.cpp
+++ b/config/Xreset.cpp
@@ -1,5 +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" \
+BINDIR/sessreg -d -w WTMP_FILE -u UTMP_FILE \
-x XDMCONFIGDIR/Xservers -l $DISPLAY -h "" $USER
diff --git a/config/Xstartup.cpp b/config/Xstartup.cpp
index 3d513f6..d837359 100644
--- a/config/Xstartup.cpp
+++ b/config/Xstartup.cpp
@@ -1,5 +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" \
+BINDIR/sessreg -a -w WTMP_FILE -u UTMP_FILE \
-x XDMCONFIGDIR/Xservers -l $DISPLAY -h "" $USER