diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2008-02-25 17:41:04 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2008-02-25 17:41:04 +0000 |
| commit | 26100be560a2f5e5d4c67d640cd288d08d575128 (patch) | |
| tree | e2f4a69c6d9c25d5d616d826fbcb780f01cfe2fc /Build | |
| parent | 783675c0cb64a4e6e625b7a4e37c320eaf17fb8d (diff) | |
temorarily disable maintainer rules
git-svn-id: svn://tug.org/texlive/trunk@6753 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
| -rw-r--r-- | Build/source/texk/make/ChangeLog | 5 | ||||
| -rw-r--r-- | Build/source/texk/make/config.mk | 48 |
2 files changed, 29 insertions, 24 deletions
diff --git a/Build/source/texk/make/ChangeLog b/Build/source/texk/make/ChangeLog index 7fb81d13b00..14c15170570 100644 --- a/Build/source/texk/make/ChangeLog +++ b/Build/source/texk/make/ChangeLog @@ -1,5 +1,10 @@ 2008-02-02 Peter Breitenlohner <peb@mppmu.mpg.de> + * config.mk: temporarily disable maintainer rules, they need to + be updated for Autoconf 2.59+. + +2008-02-02 Peter Breitenlohner <peb@mppmu.mpg.de> + * paths.mk: Add datarootdir for Autoconf 2.60+. 2007-07-29 Karl Berry <karl@tug.org> diff --git a/Build/source/texk/make/config.mk b/Build/source/texk/make/config.mk index 21a7839c73d..cc9080eb71d 100644 --- a/Build/source/texk/make/config.mk +++ b/Build/source/texk/make/config.mk @@ -1,22 +1,22 @@ # config.mk -- autoconf rules to remake the Makefile, c-auto.h, etc. -@MAINT@ac_dir = $(top_srcdir)/../etc/autoconf -@MAINT@autoconf = $(ac_dir)/acspecific.m4 $(ac_dir)/acgeneral.m4 $(ac_dir)/acsite.m4 -@MAINT@autoheader = $(ac_dir)/acconfig.h $(ac_dir)/autoheader.m4 -@MAINT@ -@MAINT@# I define $(autoconf) to acgeneral.m4 and the other Autoconf files, so -@MAINT@# configure automatically gets remade in the sources with a new Autoconf -@MAINT@# release. But it would be bad for installers with Autoconf to remake -@MAINT@# configure (not to mention require Autoconf), so I take out the variable -@MAINT@# $(autoconf) definition before release. -@MAINT@# -@MAINT@# BTW, xt.ac isn't really required for dvipsk or dviljk, but it doesn't -@MAINT@# seem worth the trouble. -@MAINT@# -@MAINT@configure_in = $(srcdir)/configure.in $(kpathsea_srcdir)/common.ac \ -@MAINT@ $(kpathsea_srcdir)/withenable.ac $(kpathsea_srcdir)/xt.ac \ -@MAINT@ $(kpathsea_srcdir_parent)/libtool.m4 -@MAINT@$(srcdir)/configure: $(configure_in) $(autoconf) -@MAINT@ cd $(srcdir) && $(top_srcdir)/../autoconf2.13 -m $(ac_dir) +@MAINT@## ac_dir = $(top_srcdir)/../etc/autoconf +@MAINT@## autoconf = $(ac_dir)/acspecific.m4 $(ac_dir)/acgeneral.m4 $(ac_dir)/acsite.m4 +@MAINT@## autoheader = $(ac_dir)/acconfig.h $(ac_dir)/autoheader.m4 +@MAINT@## +@MAINT@## # I define $(autoconf) to acgeneral.m4 and the other Autoconf files, so +@MAINT@## # configure automatically gets remade in the sources with a new Autoconf +@MAINT@## # release. But it would be bad for installers with Autoconf to remake +@MAINT@## # configure (not to mention require Autoconf), so I take out the variable +@MAINT@## # $(autoconf) definition before release. +@MAINT@## # +@MAINT@## # BTW, xt.ac isn't really required for dvipsk or dviljk, but it doesn't +@MAINT@## # seem worth the trouble. +@MAINT@## # +@MAINT@## configure_in = $(srcdir)/configure.in $(kpathsea_srcdir)/common.ac \ +@MAINT@## $(kpathsea_srcdir)/withenable.ac $(kpathsea_srcdir)/xt.ac \ +@MAINT@## $(kpathsea_srcdir_parent)/libtool.m4 +@MAINT@## $(srcdir)/configure: $(configure_in) $(autoconf) +@MAINT@## cd $(srcdir) && $(top_srcdir)/../autoconf2.13 -m $(ac_dir) config.status: $(srcdir)/configure $(SHELL) $@ --recheck @@ -24,12 +24,12 @@ config.status: $(srcdir)/configure Makefile: config.status $(srcdir)/Makefile.in $(top_srcdir)/../make/*.mk $(SHELL) $< -@MAINT@# autoheader reads acconfig.h (and c-auto.h.top) automatically. -@MAINT@$(srcdir)/c-auto.in: $(srcdir)/stamp-auto.in -@MAINT@$(srcdir)/stamp-auto.in: $(configure_in) $(autoheader) \ -@MAINT@ $(kpathsea_srcdir)/acconfig.h -@MAINT@ cd $(srcdir) && autoheader -m $(ac_dir) -l $(srcdir) -@MAINT@ date >$(srcdir)/stamp-auto.in +@MAINT@## # autoheader reads acconfig.h (and c-auto.h.top) automatically. +@MAINT@## $(srcdir)/c-auto.in: $(srcdir)/stamp-auto.in +@MAINT@## $(srcdir)/stamp-auto.in: $(configure_in) $(autoheader) \ +@MAINT@## $(kpathsea_srcdir)/acconfig.h +@MAINT@## cd $(srcdir) && autoheader -m $(ac_dir) -l $(srcdir) +@MAINT@## date >$(srcdir)/stamp-auto.in # This rule isn't used for the top-level Makefile, but it doesn't hurt. # We don't depend on config.status because configure always rewrites |