summaryrefslogtreecommitdiffstats
path: root/src/config
diff options
context:
space:
mode:
authorTheodore Tso <tytso@mit.edu>1995-06-07 20:09:58 +0000
committerTheodore Tso <tytso@mit.edu>1995-06-07 20:09:58 +0000
commit6607685503458c0468651a2a0427c3f0d9f6155a (patch)
tree551e119b618de2c4fe42434b7f169f35443eb3f8 /src/config
parent5aa2b30fec6a6d86d7baf23fe0084ab7d2e2c83f (diff)
downloadkrb5-6607685503458c0468651a2a0427c3f0d9f6155a.tar.gz
krb5-6607685503458c0468651a2a0427c3f0d9f6155a.tar.xz
krb5-6607685503458c0468651a2a0427c3f0d9f6155a.zip
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
Diffstat (limited to 'src/config')
-rw-r--r--src/config/ChangeLog6
-rw-r--r--src/config/pre.in14
2 files changed, 14 insertions, 6 deletions
diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index 10572f7a0..2740e9440 100644
--- 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 72859ccfb..6acfb376c 100644
--- 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 \