* Makefile.in (includes): New target

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

diff --git a/src/lib/krb5/error_tables/ChangeLog b/src/lib/krb5/error_tables/ChangeLog
index b756113795427ed553416119334cbd67e5570b2d..ab2a6a5200b3d4af47348417365bbf96bc6290b6 100644 (file)
--- a/src/lib/krb5/error_tables/ChangeLog
+++ b/src/lib/krb5/error_tables/ChangeLog
@@ -1,3 +1,10 @@
+2001-04-17  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (includes): New target.  Copy headers into proper
+       include directory.
+       (unixmac): Target deleted.
+       (THDRDIR): New variable.
+
 2000-10-26  Tom Yu  <tlyu@mit.edu>
 
        * asn1_err.et: Add error codes MISMATCH_INDEF and MISSING_EOC.

diff --git a/src/lib/krb5/error_tables/Makefile.in b/src/lib/krb5/error_tables/Makefile.in
index d2a52ebe52fc05b6fc093bc29167bce3cd1ee806..c732fe0f175808399f03be965644d0fcd0f69c27 100644 (file)
--- a/src/lib/krb5/error_tables/Makefile.in
+++ b/src/lib/krb5/error_tables/Makefile.in
@@ -8,20 +8,9 @@ BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
 ##DOS##OBJFILE=..\$(OUTPRE)err_tbls.lst
 ##WIN16##LIBNAME=..\krb5.lib
 
+THDRDIR=$(BUILDTOP)$(S)include
 EHDRDIR=$(BUILDTOP)$(S)include$(S)krb5
 
-# The "unixmac" and "includes" rules need to run in Makefile.in,
-# without all the support glop like $(S) and $(BUILDTOP)...so, fake it.
-#
-# Faking things breaks VPATH support, which is a requirement for me -- TYT.
-# You need to do this right!  Whatever config tools that you're using under
-# the macintosh, is going to need to handle BUILDTOP and SRCTOP explicitly.
-# Setting BUILDTOP and SRCTOP to be the same is Right Out.
-#
-#BUILDTOP2 = ../../..
-#SRCTOP2 = $(BUILDTOP2)
-#EHDRDIR2=$(BUILDTOP2)/include/krb5
-
 STLIBOBJS= asn1_err.o kdb5_err.o krb5_err.o \
       kv5m_err.o adm_err.o init_ets.o
 
@@ -37,7 +26,14 @@ SRCS= asn1_err.c kdb5_err.c krb5_err.c kv5m_err.c adm_err.c \
 all-unix:: all-libobjs
 all-libobjs: $(HDRS)
 
-unixmac: $(HDRS) $(SRCS)
+includes:: $(HDRS)
+       for f in $(HDRS) ; do \
+               if cmp $$f $(THDRDIR)/$$f >/dev/null 2>&1; then :; \
+               else \
+                       (set -x; $(RM) $(THDRDIR)/$$f; \
+                        $(CP) $$f $(THDRDIR)/$$f) ; \
+               fi ; \
+       done
 
 awk-windows:
        $(AWK) -f $(SRCTOP)/util/et/et_h.awk outfile=asn1_err.h asn1_err.et