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

17 files changed, 59 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 424c1438ce..09338d5a3d 100644
--- 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 cdc33ae0b0..8932aae4e1 100644
--- 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 44a85667ad..8f8edc07f2 100644
--- 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 c364da62d1..5d45bf2244 100644
--- 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 8671396f9c..eeefe1d038 100644
--- 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 e341f23c69..77d721b518 100644
--- 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 6c6efa06ff..a33cea928a 100644
--- 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 b4cd422c1b..8c8fa69b72 100644
--- 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 83297611af..e48321ec60 100644
--- 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 5f3576947b..35c0f07d4d 100644
--- 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 f159152663..513d7ae092 100644
--- 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 b4c6cfc6e2..fb5dbf13d2 100644
--- 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 0b8eb6c88a..2a2a7a3edf 100644
--- 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 dd26b00db8..fbc0862cc9 100644
--- 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 64540cf0d4..b7dd79cb1a 100644
--- 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 5fda57d357..ff267776cb 100644
--- 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 7098a03626..090bf35822 100644
--- 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 "$@"