Delete redundant definitions defined in pre/config.in

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

diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index ed74292a18c3210c027ad8fb7c0e9f33e8841cd1..11e9758526d12f400663205b63efcd9d95629ade 100644 (file)
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,8 @@
+Tue Mar 14 16:50:54 1995    <tytso@rsx-11.mit.edu>
+
+       * Makefile.in: Delete definition for KRB5ROOT and KRB5_INCDIR,
+               since those are defined in pre/config.in.
+
 Thu Mar 16 20:58:22 1995  John Gilmore  (gnu at toad.com)
 
        * configure.in:  Replace nonstandard CHECK_STDARG with
@@ -24,6 +29,7 @@ Tue Mar 14 17:38:28 1995 Keith Vetter (keithv@fusion.com)
           krb5_os_localaddr from los-proto to func-proto. They are needed by
           the outside world, specifically kinit.c
 
+>>>>>>> /tmp/T4a00196
 Fri Mar 10 14:23:12 1995  Theodore Y. Ts'o  <tytso@dcl>
 
        * sysincl.h: Removed definition of FD_SETSIZE, FD_SET, FD_CLR,

diff --git a/src/include/krb5/Makefile.in b/src/include/krb5/Makefile.in
index e07f191d2884d825ed5179bf22e2290e77fec136..c21a836bcdcee41d47117de2eb68717780210a66 100644 (file)
--- a/src/include/krb5/Makefile.in
+++ b/src/include/krb5/Makefile.in
@@ -36,10 +36,6 @@ clean::
 
 depend::
 
-KRB5ROOT = @KRB5ROOT@
-
-KRB5_INCDIR = $(KRB5ROOT)/include
-
 install::
        @set -x; for f in $(KRB5_HEADERS); \
        do $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(KRB5_INCDIR)/krb5/$$f ; \