From: Wilfredo Sanchez <tritan@mit.edu>
Date: Wed, 31 May 2000 06:19:16 +0000 (+0000)
Subject: Use bindir and sbindir variables provided by configure rather than
X-Git-Tag: krb5-1.3-alpha1~2106
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=991a8652a03a4423be810546f43f2fe9635ec7c3;p=krb5.git

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
---

diff --git a/src/include/krb5/Makefile.in b/src/include/krb5/Makefile.in
index 68dec6699..4b5d3f361 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 452d9c696..849f741f0 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"