pre.in: Use the GNU/configure standard method of prefix and

	exec_prefix to determine where programs get installed.  The
	use of KRB5ROOT is obsolete.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5968 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index 10572f7a0abbb7f22c523a9f15bfd4e5b9ea54bd..2740e94401134afe21c340527e3db274ffe6c98c 100644 (file)
--- a/src/config/ChangeLog
+++ b/src/config/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jun  7 16:08:35 1995    <tytso@rsx-11.mit.edu>
+
+       * pre.in: Use the GNU/configure standard method of prefix and
+               exec_prefix to determine where programs get installed.
+               The use of KRB5ROOT is obsolete.
+
 Thu May 25 21:36:40 1995  Theodore Y. Ts'o  (tytso@dcl)
 
        * pre.in(HOST_TYPE, SHEXT, DO_MAKE_SHLIB): Added variables filled

diff --git a/src/config/pre.in b/src/config/pre.in
index 72859ccfba26c639555cc373369f7d7f55ec2c77..6acfb376ccb313707c486e28d3e6f8a166e3d478 100644 (file)
--- a/src/config/pre.in
+++ b/src/config/pre.in
@@ -24,17 +24,19 @@ INSTALL=@INSTALL@
 INSTALL_PROGRAM=@INSTALL_PROGRAM@ -s
 INSTALL_DATA=@INSTALL_DATA@
 INSTALL_SETUID=$(INSTALL) -s -m 4755
+INSTALL_PREFIX=@prefix@
+INSTALL_EXEC_PREFIX=@exec_prefix@
 
-KRB5MANROOT = $(KRB5ROOT)/man
-ADMIN_BINDIR = $(KRB5ROOT)/admin
-SERVER_BINDIR = $(KRB5ROOT)/sbin
-CLIENT_BINDIR = $(KRB5ROOT)/bin
+KRB5MANROOT = $(INSTALL_PREFIX)/man
+ADMIN_BINDIR = $(INSTALL_PREFIX)/admin
+SERVER_BINDIR = $(INSTALL_EXEC_PREFIX)/sbin
+CLIENT_BINDIR = $(INSTALL_EXEC_PREFIX)/bin
 ADMIN_MANDIR = $(KRB5MANROOT)/man8
 SERVER_MANDIR = $(KRB5MANROOT)/man8
 CLIENT_MANDIR = $(KRB5MANROOT)/man1
 FILE_MANDIR = $(KRB5MANROOT)/man5
-KRB5_LIBDIR = $(KRB5ROOT)/lib
-KRB5_INCDIR = $(KRB5ROOT)/include
+KRB5_LIBDIR = $(INSTALL_PREFIX)/lib
+KRB5_INCDIR = $(INSTALL_PREFIX)/include
 KRB5_INCSUBDIRS = \
        $(KRB5_INCDIR)/krb5 \
        $(KRB5_INCDIR)/asn.1 \