Makefile.in: Process osconf.h using PREFIX and EXEC_PREFIX instead of

	KRB5ROOT.

k5-config.h: Remove old defines for krb.conf and krb.realms, which are
	now obsolete.

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

diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index f921cd6aca7a1aba7ae6ed079fa44cc3bc261e96..24eedb28590749b67ac61ac9654f0839c92e7bcf 100644 (file)
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,10 @@
+Wed Jun  7 16:23:51 1995    <tytso@rsx-11.mit.edu>
+
+       * Makefile.in: Process osconf.h using PREFIX and EXEC_PREFIX
+               instead of KRB5ROOT.
+
+       * k5-config.h: Remove old defines for krb.conf and krb.realms,
+               which are now obsolete.
 
 Mon Jun 5 13:47:30 EDT 1995    Paul Park       (pjpark@mit.edu)
        * adm_proto.h - Add new arguments to krb5_adm_connect() for support

diff --git a/src/include/krb5/Makefile.in b/src/include/krb5/Makefile.in
index 45c226503a5f5297ffc33e9ce493bb61e38c20f4..c9cc7fe6a3be7be23bf0ef960039367f19afe1d3 100644 (file)
--- a/src/include/krb5/Makefile.in
+++ b/src/include/krb5/Makefile.in
@@ -1,5 +1,3 @@
-KDB5DIR = $(KRB5ROOT)
-KRB5SRVTABDIR = /etc
 KRB5RCTMPDIR= @KRB5_RCTMPDIR@
 
 ##DOSBUILDTOP = ..\..
@@ -45,10 +43,9 @@ install::
        do $(INSTALL_DATA) $(C)$$f $(DESTDIR)$(KRB5_INCDIR)$(S)krb5$(S)$$f; \
        done
 
-PROCESS_REPLACE = -e "s+@KRB5ROOT+$(KRB5ROOT)+" \
-                 -e "s+@KDB5DIR+$(KDB5DIR)+" \
-                 -e "s+@KRB5RCTMPDIR+$(KRB5RCTMPDIR)+" \
-                 -e "s+@KRB5SRVTABDIR+$(KRB5SRVTABDIR)+" 
+PROCESS_REPLACE = -e "s+@KRB5RCTMPDIR+$(KRB5RCTMPDIR)+" \
+                 -e "s+@PREFIX+$(INSTALL_PREFIX)+" \
+                 -e "s+@EXEC_PREFIX+$(INSTALL_EXEC_PREFIX)+"
 
 OSCONFSRC = $(srcdir)/stock/osconf.h
 

diff --git a/src/include/krb5/k5-config.h b/src/include/krb5/k5-config.h
index f4d94e41cf65010b3a180abe2f519f61b77abb7b..244c5ae7fb016dc91acce773cbcf7f33d56793fb 100644 (file)
--- a/src/include/krb5/k5-config.h
+++ b/src/include/krb5/k5-config.h
@@ -33,10 +33,6 @@
 /* Kerberos Windows initialization file */
 #define KERBEROS_INI    "kerberos.ini"
 #define INI_FILES       "Files"
-#ifdef OLD_CONFIG_FILES
-#define INI_KRB_CONF    "krb.conf"             /* Location of krb.conf file */
-#define INI_KRB_REALMS  "krb.realms"   /* Location of krb.realms file */
-#endif
 #define INI_KRB_CCACHE  "krb5cc"       /* Location of the ccache */
 #define INI_KRB5_CONF   "krb5.ini"             /* Location of krb5.conf file */