From: Ken Raeburn <raeburn@mit.edu>
Date: Tue, 8 Jun 2004 20:05:39 +0000 (+0000)
Subject: * Makefile.in ($(srcdir)/krb5/autoconf.stmp): Always use --include, don't
X-Git-Tag: krb5-1.4-beta1~350
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e192e142304ff11c14ca89866f19ae0e6aa90c6c;p=krb5.git

* Makefile.in ($(srcdir)/krb5/autoconf.stmp): Always use --include, don't
try --localdir.
(all-recurse): Depend on krb5/autoconf.h.

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

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 1f2964d6d..d67d0f8f2 100644
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-08  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in ($(srcdir)/krb5/autoconf.stmp): Always use
+	--include, don't try --localdir.
+	(all-recurse): Depend on krb5/autoconf.h.
+
 2004-06-04  Ken Raeburn  <raeburn@mit.edu>
 
 	* configure.in: Check number of arguments to getpwnam_r and
diff --git a/src/include/Makefile.in b/src/include/Makefile.in
index 346b4a155..8ad011056 100644
--- a/src/include/Makefile.in
+++ b/src/include/Makefile.in
@@ -24,11 +24,12 @@ maybe-make-db.h-sys:
 maybe-make-db.h-redirect:
 	test -r db.h || echo '#include <@DB_HEADER@>' > db.h
 
+all-recurse: krb5/autoconf.h
 krb5/autoconf.h: $(srcdir)/krb5/autoconf.h.in
 	(cd krb5; $(MAKE) autoconf.h)
 $(srcdir)/krb5/autoconf.h.in: @MAINT@ $(srcdir)/krb5/autoconf.stmp
 $(srcdir)/krb5/autoconf.stmp: $(srcdir)/configure.in $(SRCTOP)/aclocal.m4
-	cd $(srcdir) && ($(AUTOHEADER) --include=$(CONFIG_RELTOPDIR) $(AUTOHEADERFLAGS) || $(AUTOHEADER) --localdir=$(CONFIG_RELTOPDIR) $(AUTOHEADERFLAGS))
+	cd $(srcdir) && $(AUTOHEADER) --include=$(CONFIG_RELTOPDIR) $(AUTOHEADERFLAGS)
 	touch $(srcdir)/krb5/autoconf.stmp
 
 krb5.h: krb5/autoconf.h $(srcdir)/krb5.hin krb5_err.h kdb5_err.h kv5m_err.h krb524_err.h \