diff options
| author | Paul Park <pjpark@mit.edu> | 1995-05-22 15:19:01 +0000 |
|---|---|---|
| committer | Paul Park <pjpark@mit.edu> | 1995-05-22 15:19:01 +0000 |
| commit | c94186b0d144e9c9b2ea32910eb49b7fe6829ff4 (patch) | |
| tree | dd7c01dd674aa1fe0a27c0c04b4f948bc7a8eb57 /src/include/krb5 | |
| parent | fa47062617aedddbca9cc45fa52e1d4b896d7f2f (diff) | |
Fix install target logic
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5836 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include/krb5')
| -rw-r--r-- | src/include/krb5/ChangeLog | 6 | ||||
| -rw-r--r-- | src/include/krb5/Makefile.in | 17 | ||||
| -rw-r--r-- | src/include/krb5/configure.in | 1 |
3 files changed, 13 insertions, 11 deletions
diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog index 1f23cca36..b0f9d15b7 100644 --- a/src/include/krb5/ChangeLog +++ b/src/include/krb5/ChangeLog @@ -1,3 +1,9 @@ + +Mon May 22 09:41:39 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - (install) Always perform install actions using + $(INSTALL_DATA). + * configure.in - Locate install program. + Sun May 21 15:25:45 1995 Ezra Peisach <epeisach@kangaroo.mit.edu> * Makefile.in (PROCESS_REPLACE): Replace the RCTMPDIR in stock.h diff --git a/src/include/krb5/Makefile.in b/src/include/krb5/Makefile.in index dee7f567c..45c226503 100644 --- a/src/include/krb5/Makefile.in +++ b/src/include/krb5/Makefile.in @@ -36,19 +36,14 @@ clean:: depend:: -install:: $(KRB5_HEADERS) osconf.h autoconf.h +install:: @set -x; for f in $(KRB5_HEADERS) ; \ - do if cmp -s $$f $(DESTDIR)$(KRB5_INCDIR)/krb5/$$f; \ - then true; else \ - $(RM) $(DESTDIR)$(KRB5_INCDIR)/krb5/$$f; \ - cp $(srcdir)/$$f $(DESTDIR)$(KRB5_INCDIR)/krb5/$$f ; \ - fi; done + do $(INSTALL_DATA) $(srcdir)$(S)$$f \ + $(DESTDIR)$(KRB5_INCDIR)$(S)krb5$(S)$$f ; \ + done @set -x; for f in osconf.h autoconf.h $(ET_HEADERS); \ - do if cmp -s $$f $(DESTDIR)$(KRB5_INCDIR)/krb5/$$f; \ - then true; else \ - $(RM) $(DESTDIR)$(KRB5_INCDIR)/krb5/$$f; \ - cp $$f $(DESTDIR)$(KRB5_INCDIR)/krb5/$$f ; \ - fi; done + do $(INSTALL_DATA) $(C)$$f $(DESTDIR)$(KRB5_INCDIR)$(S)krb5$(S)$$f; \ + done PROCESS_REPLACE = -e "s+@KRB5ROOT+$(KRB5ROOT)+" \ -e "s+@KDB5DIR+$(KDB5DIR)+" \ diff --git a/src/include/krb5/configure.in b/src/include/krb5/configure.in index e14e3e477..69ce4f580 100644 --- a/src/include/krb5/configure.in +++ b/src/include/krb5/configure.in @@ -158,4 +158,5 @@ else AC_MSG_RESULT(Kerberos 4 compatibility enabled) AC_DEFINE(KRB5_KRB4_COMPAT) fi +AC_PROG_INSTALL V5_AC_OUTPUT_MAKEFILE |