diff options
| author | Tom Yu <tlyu@mit.edu> | 1995-05-04 14:06:24 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 1995-05-04 14:06:24 +0000 |
| commit | 0d1bacf1c818b826cbf328e8f4762fb34daf44d5 (patch) | |
| tree | 08b9d4406952b9214360acb8b69ae3949a1cfdb0 /src/lib | |
| parent | 2df843a0a944ec2816be7a91585936a33ab3c95d (diff) | |
| download | krb5-0d1bacf1c818b826cbf328e8f4762fb34daf44d5.tar.gz krb5-0d1bacf1c818b826cbf328e8f4762fb34daf44d5.tar.xz krb5-0d1bacf1c818b826cbf328e8f4762fb34daf44d5.zip | |
* Makefile.in: new includes target to install krb_err.h in
$(BUILDTOP)/include; includes depends on krb_err.h.
Previously, it was attempting to install a header that had
not yet been generated!
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5718 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/krb4/ChangeLog | 7 | ||||
| -rw-r--r-- | src/lib/krb4/Makefile.in | 15 |
2 files changed, 14 insertions, 8 deletions
diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog index 5a7493d11..13994b1e8 100644 --- a/src/lib/krb4/ChangeLog +++ b/src/lib/krb4/ChangeLog @@ -1,3 +1,10 @@ +Thu May 4 10:03:22 1995 Tom Yu (tlyu@dragons-lair) + + * Makefile.in: new includes target to install krb_err.h in + $(BUILDTOP)/include; includes depends on krb_err.h. + Previously, it was attempting to install a header that had + not yet been generated! + Tue May 2 09:30:50 1995 Ezra Peisach <epeisach@kangaroo.mit.edu> * Makefile.in (clean-unix): Remove krb_err.h from the include diff --git a/src/lib/krb4/Makefile.in b/src/lib/krb4/Makefile.in index 31d05559b..888bb3740 100644 --- a/src/lib/krb4/Makefile.in +++ b/src/lib/krb4/Makefile.in @@ -6,6 +6,8 @@ DEFINES=-I$(srcdir)/../../include/kerberosIV ##DOSLIBNAME=..\krb5.lib ##DOS!include $(BUILDTOP)\config\windows.in +EHDRDIR=$(BUILDTOP)$(S)include + OBJS = \ cr_auth_repl.$(OBJEXT) \ cr_ciph.$(OBJEXT) \ @@ -154,7 +156,7 @@ install:: install-$(WHAT) # We want *library* compiler options... DBG=$(DBG_LIB) -all-unix:: $(LIBNAME) krb_err.h +all-unix:: $(LIBNAME) krb_err.h includes # comp_et_depend(krb_err) krb_err.h:: krb_err.et @@ -165,12 +167,11 @@ depend:: krb_err.h depend:: $(CODE) -krb_err.h:: - -if cmp krb_err.h ../../include/krb_err.h >/dev/null 2>&1; then \ - echo ; \ +includes:: krb_err.h + if cmp krb_err.h $(EHDRDIR)/krb_err.h >/dev/null 2>&1; then :; \ else \ - $(RM) ../../include/krb_err.h ; \ - $(CP) krb_err.h ../../include/krb_err.h; \ + (set -x; $(RM) $(EHDRDIR)/krb_err.h; \ + $(CP) krb_err.h $(EHDRDIR)/krb_err.h) \ fi #install-unix:: @@ -179,8 +180,6 @@ krb_err.h:: DEFINES=$(FALLBACK) $(OLD_SRVTAB) $(OLD_KLOGIN) -I$(srcdir)/../../include/kerberosIV -all-unix:: krb_err.h - $(LIBNAME): $(OBJS) $(RM) $@ $(ARCHIVE) $(ARCHIVEARGS) |