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 68dec6699373af74549051b7532fd96dd6fedffc..4b5d3f3611dfe202c2361a7163cf78377a51d604 100644 (file)
--- 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 452d9c696970eb7989f996c797531e81600740f2..849f741f0f55da2bd692c69167f4a31fe0bd6cd1 100644 (file)
--- 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"