Implement an install-headers target to install public headers into KRB5_INCDIR;

probably called by setting DESTDIR.

ticket: 1208

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 424c1438ce55e037dcec316bc2edb41c92ea0f51..09338d5a3d611deeb7ab62947035e7a788565ba5 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-07  Sam Hartman  <hartmans@mit.edu>
+
+       * Makefile.in (install-headers-prerecurse): Create directories in which we install headers
+
 2002-09-24  Ezra Peisach  <epeisach@bu.edu>
 
        * Makefile.in (krb5-config): Add argument to invocation of

diff --git a/src/Makefile.in b/src/Makefile.in
index cdc33ae0b009dfc6e0721e64a7c4a707219368bc..8932aae4e11ba85cbbd81cbf097d2dd3dbca9516 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -62,6 +62,12 @@ install-mkdirs:
                $(srcdir)/config/mkinstalldirs $(DESTDIR)$$i; \
        done
 
+install-headers-prerecurse::
+       $(srcdir)/config/mkinstalldirs $(DESTDIR)$(KRB5_INCDIR)
+       $(srcdir)/config/mkinstalldirs $(DESTDIR)$(KRB5_INCDIR)/gssapi
+       $(srcdir)/config/mkinstalldirs $(DESTDIR)$(KRB5_INCDIR)/kerberosIV
+
+
 # install::
 #      $(MAKE) $(MFLAGS) install.man
 

diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index 44a85667adb8935ab95705ebd9c583d05c600727..8f8edc07f2be52ffe6f674a89ac0d56da994fadd 100644 (file)
--- a/src/config/ChangeLog
+++ b/src/config/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-07  Sam Hartman  <hartmans@mit.edu>
+
+       * pre.in post.in (RECURSE_TARGETS): Add install-headers-recurse
+
 2002-09-24  Ezra Peisach  <epeisach@bu.edu>
 
        * post.in (Makefile): Run config.status to generate only the

diff --git a/src/config/post.in b/src/config/post.in
index c364da62d11a014799fef8d331f0363dd4d9e56d..5d45bf224484c026df2257c01813dc14c0588086 100644 (file)
--- a/src/config/post.in
+++ b/src/config/post.in
@@ -100,7 +100,7 @@ $(srcdir)/$(thisconfigdir)/configure: $(srcdir)/$(thisconfigdir)/configure.in \
        -$(RM) -r $(srcdir)/$(thisconfigdir)/autom4te.cache
 
 RECURSE_TARGETS=all-recurse clean-recurse distclean-recurse install-recurse \
-       check-recurse depend-recurse Makefiles-recurse
+       check-recurse depend-recurse Makefiles-recurse install-headers-recurse
 
 $(RECURSE_TARGETS):
        @case "`echo 'x$(MFLAGS)'|sed -e 's/^x//' -e 's/ --.*$$//'`" \

diff --git a/src/config/pre.in b/src/config/pre.in
index 8671396f9c1b47187537d1fd86b7d8f7ae007024..eeefe1d0388fbe2ffc5880f8e8bf5cebff38004d 100644 (file)
--- a/src/config/pre.in
+++ b/src/config/pre.in
@@ -12,6 +12,8 @@ install:: install-$(WHAT)
 
 check:: check-$(WHAT)
 
+install-headers:: install-headers-$(WHAT)
+
 all-recurse: all-prerecurse
 all-postrecurse:: all-recurse
 all-unix:: all-postrecurse
@@ -37,6 +39,15 @@ install-unix:: install-postrecurse
 install-prerecurse::
 install-postrecurse::
 
+install-headers-unix:: install-headers-prerecurse
+install-headers-unix:: install-headers-recurse
+install-headers-unix:: install-headers-postrecurse
+
+install-headers-prerecurse::
+
+install-headers-postrecurse::
+
+
 check-unix:: check-prerecurse
 check-unix:: check-recurse
 check-unix:: check-postrecurse

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index e341f23c690d44e896e5bca1c48b3ef3e923ccb9..77d721b518cbf0c4a9f0b7439655ceab823aacd3 100644 (file)
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-07  Sam Hartman  <hartmans@mit.edu>
+
+       * Makefile.in : Add install-headers support
+
 2002-09-26  Tom Yu  <tlyu@mit.edu>
 
        * socket-utils.h (sa2sin, sa2sin6): Add redundant cast to (void *)

diff --git a/src/include/Makefile.in b/src/include/Makefile.in
index 6c6efa06fff5f1fb989c595ca01183c305a519c2..a33cea928a476785836e94ad1de5985116810756 100644 (file)
--- a/src/include/Makefile.in
+++ b/src/include/Makefile.in
@@ -72,6 +72,6 @@ clean-windows::
        cd ..
        @echo Making clean in include
 
-install:: krb5.h profile.h
+install-headers-unix install:: krb5.h profile.h kerberosIV/krb_err.h
        $(INSTALL_DATA) krb5.h $(DESTDIR)$(KRB5_INCDIR)$(S)krb5.h
        $(INSTALL_DATA) profile.h $(DESTDIR)$(KRB5_INCDIR)$(S)profile.h

diff --git a/src/include/kerberosIV/ChangeLog b/src/include/kerberosIV/ChangeLog
index b4cd422c1b8e822daee96a098482a81756f7a9f8..8c8fa69b7276d26e7620b5ac00fba7b54ef35354 100644 (file)
--- a/src/include/kerberosIV/ChangeLog
+++ b/src/include/kerberosIV/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-07  Sam Hartman  <hartmans@mit.edu>
+
+       * Makefile.in: Support install-headers
+
 2002-09-26  Tom Yu  <tlyu@mit.edu>
 
        * des.h: Some initial work for KfM integration.  Clean up

diff --git a/src/include/kerberosIV/Makefile.in b/src/include/kerberosIV/Makefile.in
index 83297611af05ee94ec3142a0af7495447200f1a5..e48321ec608e555750620726f560b9a084066db9 100644 (file)
--- a/src/include/kerberosIV/Makefile.in
+++ b/src/include/kerberosIV/Makefile.in
@@ -11,7 +11,7 @@ krb_err.h: $(SRCTOP)/lib/krb4/krb_err.et
        $(AWK) -f $(SRCTOP)/util/et/et_h.awk outfile=$@ \
                $(SRCTOP)/lib/krb4/krb_err.et
 
-install::
+install-headers-unix install:: krb_err.h
        @set -x; for f in $(KRB4_HEADERS) ; \
        do $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(KRB5_INCDIR)/kerberosIV/$$f ; \
        done

diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog
index 5f3576947bcd6e408968caf04fa99e1458e76c07..35c0f07d4d74a0f0ad0a019fa200050b73465fcc 100644 (file)
--- a/src/lib/gssapi/generic/ChangeLog
+++ b/src/lib/gssapi/generic/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-07  Sam Hartman  <hartmans@mit.edu>
+
+       * Makefile.in : Add install-headers- support
+
 2002-08-29  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.in: Revert $(S)=>/ change, for Windows support.

diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in
index f1591526637e2a1a24633d303e5cab27621a26c7..513d7ae09206874b2f9346ed704e7e2da3314f56 100644 (file)
--- a/src/lib/gssapi/generic/Makefile.in
+++ b/src/lib/gssapi/generic/Makefile.in
@@ -120,7 +120,7 @@ includes-unix::
        @if test -d $(EHDRDIR); then :; else (set -x; mkdir $(EHDRDIR)) fi
 
 # Krb5InstallHeaders($(EXPORTED_HEADERS), $(KRB5_INCDIR)/krb5)
-install::
+install-headers-unix install:: gssapi.h
        @set -x; for f in $(EXPORTED_HEADERS) ; \
        do $(INSTALL_DATA) $(srcdir)/$$f        \
                $(DESTDIR)$(KRB5_INCDIR)/gssapi/$$f ; \

diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index b4c6cfc6e2bbf36d54d7eb32f5ec5274dc12c999..fb5dbf13d283b5fbf292e6d00e0823f70f20d748 100644 (file)
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-07  Sam Hartman  <hartmans@mit.edu>
+
+       * Makefile.in :  Add install-headers support
+
 2002-08-29  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.in: Revert $(S)=>/ change, for Windows support.

diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in
index 0b8eb6c88aa0e041e4c884d5dafe0ca103e71cef..2a2a7a3edf44f212fdd3cdecf6253e4a0b97c646 100644 (file)
--- a/src/lib/gssapi/krb5/Makefile.in
+++ b/src/lib/gssapi/krb5/Makefile.in
@@ -199,7 +199,7 @@ clean-windows::
        $(RM) $(EHDRDIR)\gssapi_krb5.h
        -if exist $(EHDRDIR)\nul rmdir $(EHDRDIR)
 
-install::
+install-headers-unix install::
        @set -x; for f in $(EXPORTED_HEADERS) ; \
        do $(INSTALL_DATA) $(srcdir)/$$f        \
                $(DESTDIR)$(KRB5_INCDIR)/gssapi/$$f ; \

diff --git a/src/util/et/ChangeLog b/src/util/et/ChangeLog
index dd26b00db8080f15c501ccec570acbc3919e4997..fbc0862cc91385e71d98bdd441dd91464da47fdf 100644 (file)
--- a/src/util/et/ChangeLog
+++ b/src/util/et/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-07  Sam Hartman  <hartmans@mit.edu>
+
+       * Makefile.in (install-headers): build compile_et so it can be used later
+
 2002-09-02  Ken Raeburn  <raeburn@mit.edu>
 
        * com_err.c (default_com_err_proc, com_err_va, set_com_err_hook):

diff --git a/src/util/et/Makefile.in b/src/util/et/Makefile.in
index 64540cf0d4617dac08bc957e5aa4da333df1cfab..b7dd79cb1a302b1167f51bd918446bc82157a8f1 100644 (file)
--- a/src/util/et/Makefile.in
+++ b/src/util/et/Makefile.in
@@ -157,6 +157,9 @@ install-unix:: compile_et
        $(INSTALL_DATA) $(srcdir)/et_c.awk $(DESTDIR)$(mydatadir)
        $(INSTALL_DATA) $(srcdir)/et_h.awk $(DESTDIR)$(mydatadir)
 
+
+install-headers:: compile_et
+
 compile_et: $(srcdir)/compile_et.sh $(srcdir)/config_script
        $(SHELL) $(srcdir)/config_script $(srcdir)/compile_et.sh \
                "$(mydatadir)" $(AWK) $(SED) > compile_et

diff --git a/src/util/profile/ChangeLog b/src/util/profile/ChangeLog
index 5fda57d35747c5c29ae1ccba8fb9725fb547acae..ff267776cbf29a6c2c2abc457302db3d4d424a0b 100644 (file)
--- a/src/util/profile/ChangeLog
+++ b/src/util/profile/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-07  Sam Hartman  <hartmans@mit.edu>
+
+       * Makefile.in: Support install-headers
+
 2002-10-03  Sam Hartman  <hartmans@mit.edu>
 
        * Makefile.in :  Move test_* from all to check targets. so that com_err is not needed on mac.

diff --git a/src/util/profile/Makefile.in b/src/util/profile/Makefile.in
index 7098a036265f9d6628f283983f8b67c59d8e921c..090bf358220bfee79cc1d3ca32a442fbb2f51cdb 100644 (file)
--- a/src/util/profile/Makefile.in
+++ b/src/util/profile/Makefile.in
@@ -56,6 +56,8 @@ all-unix:: includes
 all-unix:: all-libs
 all-windows:: $(PROFILE_HDR)
 
+install-headers-unix:: includes
+
 $(PROFILE_HDR):: profile.h
        $(CP) profile.h "$@"