diff options
| author | Theodore Tso <tytso@mit.edu> | 1995-06-07 20:26:06 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1995-06-07 20:26:06 +0000 |
| commit | 656cdb13bc6e3ef7eb9565c5dea6fc693e2e7b2d (patch) | |
| tree | 6453d6088535f7cb3dd3a934d9d08b1562a2d457 /src/include | |
| parent | 8e63e252f9ad5a9c206be790f2d360d3872ab87c (diff) | |
| download | krb5-656cdb13bc6e3ef7eb9565c5dea6fc693e2e7b2d.tar.gz krb5-656cdb13bc6e3ef7eb9565c5dea6fc693e2e7b2d.tar.xz krb5-656cdb13bc6e3ef7eb9565c5dea6fc693e2e7b2d.zip | |
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
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/krb5/ChangeLog | 7 | ||||
| -rw-r--r-- | src/include/krb5/Makefile.in | 9 | ||||
| -rw-r--r-- | src/include/krb5/k5-config.h | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog index f921cd6ac..24eedb285 100644 --- 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 45c226503..c9cc7fe6a 100644 --- 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 f4d94e41c..244c5ae7f 100644 --- 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 */ |