* Makefile.in (KRB5_HEADERS, install): `Make install' now works.

* configure.in (WITH_KRB5ROOT):  For `make install'.
* krb5.h:  Include "k5-errors.h" rather than "errors.h".

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

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 973e71810d6f7db6e0ead268dafb734f9c808211..2de0f8fb0e28760e16e3611c4bec2a7b0f5450f9 100644 (file)
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,9 @@
+Tue Mar 28 18:12:32 1995  John Gilmore  (gnu at toad.com)
+
+       * Makefile.in (KRB5_HEADERS, install):  `Make install' now works.
+       * configure.in (WITH_KRB5ROOT):  For `make install'.
+       * krb5.h:  Include "k5-errors.h" rather than "errors.h".
+
 Fri Mar 17 19:10:41 1995  John Gilmore  (gnu at toad.com)
 
        * krb5.h:  Move <sys/types> and u_long (etc) code to krb5/k5-config.h.

diff --git a/src/include/Makefile.in b/src/include/Makefile.in
index 09e7c8961f26e5fc513d9850e0f03190b642de54..219d0ceb8d1f2e9e191b0d96ebc7c87ecd586c93 100644 (file)
--- a/src/include/Makefile.in
+++ b/src/include/Makefile.in
@@ -26,3 +26,11 @@ clean-windows::
        cd ..
        @echo Making clean locally
 
+KRB5_HEADERS = krb5.h k5-int.h
+install:: $(KRB5_HEADERS)
+       @set -x; for f in $(KRB5_HEADERS) ; \
+       do if cmp -s $$f $(DESTDIR)$(KRB5_INCDIR)/$$f; \
+       then true; else \
+               $(RM) $(DESTDIR)$(KRB5_INCDIR)/$$f; \
+               cp $(srcdir)/$$f $(DESTDIR)$(KRB5_INCDIR)/$$f ; \
+       fi; done

diff --git a/src/include/configure.in b/src/include/configure.in
index e6adf6c1beee4ce4450b3a240e76dedd7c307ac5..d24db212c437046bc8b7b4db88ff805e739e3c07 100644 (file)
--- a/src/include/configure.in
+++ b/src/include/configure.in
@@ -1,6 +1,7 @@
 AC_INIT(configure.in)
 AC_SET_BUILDTOP
 WITH_CCOPTS
+WITH_KRB5ROOT
 CONFIG_DIRS(krb5 kerberosIV)
 MAKE_SUBDIRS("making",all)
 MAKE_SUBDIRS("cleaning",clean)

diff --git a/src/include/krb5.h b/src/include/krb5.h
index 64ef7da220b041c676ce2af9840a545ee6031664..f322bac9c8cd3538b41fea0f9e79038c04e0e323 100644 (file)
--- a/src/include/krb5.h
+++ b/src/include/krb5.h
@@ -44,7 +44,7 @@ typedef struct _krb5_auth_context krb5_auth_context;
 
 #include "encryption.h"
 #include "fieldbits.h"
-#include "errors.h"
+#include "k5-errors.h"
 #include "proto.h"
 #include "macros.h"
 #include "error_def.h"