aboutsummaryrefslogtreecommitdiff
path: root/src/include/krb5
diff options
context:
space:
mode:
authorWilfredo Sanchez <tritan@mit.edu>2000-05-31 06:19:16 +0000
committerWilfredo Sanchez <tritan@mit.edu>2000-05-31 06:19:16 +0000
commit991a8652a03a4423be810546f43f2fe9635ec7c3 (patch)
treed822a885acc45395695445dd32b0e10279a0e5e0 /src/include/krb5
parent267a04cc0eb0d7877a3769de13aa9cd1e7db77f9 (diff)
downloadkrb5-991a8652a03a4423be810546f43f2fe9635ec7c3.zip
krb5-991a8652a03a4423be810546f43f2fe9635ec7c3.tar.gz
krb5-991a8652a03a4423be810546f43f2fe9635ec7c3.tar.bz2
Use bindir and sbindir variables provided by configure rather than
assuming a standard layout in osconf.h. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12315 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include/krb5')
-rw-r--r--src/include/krb5/Makefile.in4
-rw-r--r--src/include/krb5/stock/osconf.h4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/include/krb5/Makefile.in b/src/include/krb5/Makefile.in
index 68dec66..4b5d3f3 100644
--- a/src/include/krb5/Makefile.in
+++ b/src/include/krb5/Makefile.in
@@ -41,9 +41,13 @@ autoconf.stamp: $(srcdir)/autoconf.h.in $(thisconfigdir)/config.status
SYSCONFDIR = @sysconfdir@
LOCALSTATEDIR = @localstatedir@
+BINDIR = @bindir@
+SBINDIR = @sbindir@
PROCESS_REPLACE = -e "s+@KRB5RCTMPDIR+$(KRB5RCTMPDIR)+" \
-e "s+@PREFIX+$(INSTALL_PREFIX)+" \
-e "s+@EXEC_PREFIX+$(INSTALL_EXEC_PREFIX)+" \
+ -e "s+@BINDIR+$(BINDIR)+" \
+ -e "s+@SBINDIR+$(SBINDIR)+" \
-e 's+@LOCALSTATEDIR+$(LOCALSTATEDIR)+' \
-e 's+@SYSCONFDIR+$(SYSCONFDIR)+'
diff --git a/src/include/krb5/stock/osconf.h b/src/include/krb5/stock/osconf.h
index 452d9c6..849f741 100644
--- a/src/include/krb5/stock/osconf.h
+++ b/src/include/krb5/stock/osconf.h
@@ -89,8 +89,8 @@
#define RCTMPDIR "@KRB5RCTMPDIR" /* directory to store replay caches */
#define KRB5_PATH_TTY "/dev/tty"
-#define KRB5_PATH_LOGIN "@EXEC_PREFIX/sbin/login.krb5"
-#define KRB5_PATH_RLOGIN "@EXEC_PREFIX/bin/rlogin"
+#define KRB5_PATH_LOGIN "@SBINDIR/login.krb5"
+#define KRB5_PATH_RLOGIN "@BINDIR/rlogin"
#define KRB5_ENV_CCNAME "KRB5CCNAME"