aboutsummaryrefslogtreecommitdiff
path: root/Make-dist
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-10-08 08:44:09 +0000
committerRoland McGrath <roland@gnu.org>2002-10-08 08:44:09 +0000
commit1400de2e9c706bc2ff357be7f84910723b84fb33 (patch)
tree4a0397e3eae619384abbcfd778d780fdefd90f74 /Make-dist
parent44f8b0fd29027efd23d3267ffa664bc612bdb473 (diff)
downloadglibc-1400de2e9c706bc2ff357be7f84910723b84fb33.zip
glibc-1400de2e9c706bc2ff357be7f84910723b84fb33.tar.gz
glibc-1400de2e9c706bc2ff357be7f84910723b84fb33.tar.bz2
2002-10-08 Roland McGrath <roland@redhat.com>
* configure.in (AUTOCONF): New check to set it. Set to "no" if the one found doesn't work on our configure.in. * configure: Regenerated. * config.make.in (AUTOCONF): New substituted variable. * Makefile (autoconf-it-cvs): New canned sequence, broken out of ... (autoconf-it): ... here, use that instead of defining conditionally. Use $(AUTOCONF) instead of literal autoconf. [$(AUTOCONF) != no] (configure, %/configure): Protect these rules with this condition. * Make-dist (autoconf-it, configure, %/configure): Copy those changes.
Diffstat (limited to 'Make-dist')
-rw-r--r--Make-dist18
1 files changed, 13 insertions, 5 deletions
diff --git a/Make-dist b/Make-dist
index 9417904..00c4d15 100644
--- a/Make-dist
+++ b/Make-dist
@@ -190,22 +190,30 @@ foo:=$(shell echo '+sysdep-dist=$(+sysdep-dist)' >&2)
+tsrcs := $(+tsrcs) $(+sysdep-tsrcs) $(wildcard $(+sysdep-names:%=include/%))
+ifneq ($(AUTOCONF),no)
+
ifeq ($(with-cvs),yes)
-define autoconf-it
-autoconf $(ACFLAGS) $< > $@.new
-mv -f $@.new $@
+define autoconf-it-cvs
test ! -d CVS || cvs $(CVSOPTS) commit -m'Regenerated: autoconf $(ACFLAGS) $<' $@
endef
else
+autoconf-it-cvs =
+endif
+
define autoconf-it
-autoconf $(ACFLAGS) $< > $@.new
+@-rm -f $@.new
+$(AUTOCONF) $(ACFLAGS) $< > $@.new
+chmod a-w,a+x $@.new
mv -f $@.new $@
+$(autoconf-it-cvs)
endef
-endif
configure: configure.in aclocal.m4; $(autoconf-it)
%/configure: %/configure.in aclocal.m4; $(autoconf-it)
+endif # $(AUTOCONF) = no
+
+
dist: $(tardir).tar.bz2
rm $(tardir).tar