pullup from trunk

ticket: 2775
version_fixed: 1.4

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@16889 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/ChangeLog b/src/ChangeLog
index fe47c6aebe321abbfd84142d62a714d66f5849e2..3af220123899660a03fc6f77e5b6a717a101e7eb 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-18  Tom Yu  <tlyu@mit.edu>
+
+       * Makefile.in (install-headers-mkdirs): Create KRB5_INCDIR/gssrpc.
+
 2004-10-06  Tom Yu  <tlyu@mit.edu>
 
        * Makefile.in (INSTALLMKDIRS): Add EXAMPLEDIR.

diff --git a/src/Makefile.in b/src/Makefile.in
index 225868eb6dc396d6cc3a4aba45c45b1eb9bbc774..23954c52b39a78cd21813b592c34adbc8cd18ce6 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -74,6 +74,7 @@ install-mkdirs:
 install-headers-mkdirs:
        $(srcdir)/config/mkinstalldirs $(DESTDIR)$(KRB5_INCDIR)
        $(srcdir)/config/mkinstalldirs $(DESTDIR)$(KRB5_INCDIR)/gssapi
+       $(srcdir)/config/mkinstalldirs $(DESTDIR)$(KRB5_INCDIR)/gssrpc
        $(srcdir)/config/mkinstalldirs $(DESTDIR)$(KRB5_INCDIR)/kerberosIV
 install-headers-prerecurse: install-headers-mkdirs
 

diff --git a/src/lib/rpc/ChangeLog b/src/lib/rpc/ChangeLog
index d3070b4b7de5744ec12b661c2344b2620b26417e..4c462856547b969cdfb3e3af13adcb1804fd0bb4 100644 (file)
--- a/src/lib/rpc/ChangeLog
+++ b/src/lib/rpc/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-18  Tom Yu  <tlyu@mit.edu>
+
+       * Makefile.in (install-unix): Install into KRB5_INCDIR/gssrpc,
+       rather than just KRB5_INCDIR.
+
 2004-10-25  Tom Yu  <tlyu@mit.edu>
 
        * auth_gss.c (authgss_get_private_data): New function.

diff --git a/src/lib/rpc/Makefile.in b/src/lib/rpc/Makefile.in
index b303bb313729c4e240a79ecf6264b2a751f7b058..b9bd4c6768c7a98a9956a6f8b7b41e1ebb0295ec 100644 (file)
--- a/src/lib/rpc/Makefile.in
+++ b/src/lib/rpc/Makefile.in
@@ -191,10 +191,10 @@ install-unix:: install-libs
 
 install-unix::
        for i in $(SRC_HDRS); do \
-               (set -x; $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(KRB5_INCDIR)$(S)$$i) ; \
+               (set -x; $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(KRB5_INCDIR)$(S)gssrpc$(S)$$i) ; \
        done
        for i in $(BUILD_HDRS); do \
-               (set -x; $(INSTALL_DATA) $$i $(DESTDIR)$(KRB5_INCDIR)$(S)$$i) ; \
+               (set -x; $(INSTALL_DATA) $$i $(DESTDIR)$(KRB5_INCDIR)$(S)gssrpc$(S)$$i) ; \
        done
 
 BUILD_HDRS = types.h