sys-devel/autoconf: Bump to version 2.70_beta3. Removed old

This is called autoconf-2.69e by upstream

Bug: https://bugs.gentoo.org/732648
Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>

4 files changed, 2 insertions, 334 deletions

diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index 32abaa96df95..af16f06d7dd2 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -2,4 +2,4 @@ DIST autoconf-2.13.tar.gz 443844 BLAKE2B ade10f9d4a0b1a0e8b752eee817cfe100d77b07
 DIST autoconf-2.64.tar.xz 1113892 BLAKE2B 598873209a67725150cd4cf09c4b78b26b3d1782f259846da48dc8106a1d32ae2b24f3a864c3be0e9e8dc7d6b6ca8781b83ff33a691c88e68391d1ea861ccf23 SHA512 ee4b504447c14a59b849d0915e55a90522cfb071d1583af2bd3575e5a05d7bd290e55e0e9d0760c8f36043f926199fc2d962b559d27d2f95c70d0e147b4ad0a3
 DIST autoconf-2.69-runstatedir_patches.tar.xz 257096 BLAKE2B ae765e0ca7fe8261117f6f6b75611c232fc3d4016c22c86346afa72f2b7e6c3b7ccc1f9dfe134b2443f8bde6d578b503d79cf88472f76ce75b6c2e843ef55b8e SHA512 55f93299fe5243151f6bb782986a7935270f06d5065929f4d365a37aba05703e3ce66ecf7981d30413db50ee6b4f77d81d10a71b539c8a366c5c5a156c5443da
 DIST autoconf-2.69.tar.xz 1214744 BLAKE2B 71d33d72a06e9a05fbed0eda73bc9d8a3805c7c90bf082959862f93f3c5f01192114176e84d84ecb58fa99512eafbc0ab21ad1407be18c8c63bb3dc1117c482d SHA512 995d3e5a8eb1eb37e2b7fae53c6ec7a9b4df997286b7d643344818f94636756b1bf5ff5ea9155e755cb9461149a853dfbf2886fc6bd7132e5afa9c168e306e9b
-DIST autoconf-2.70_beta3.tar.xz 1321512 BLAKE2B 92dca4fbd6c247a3b3383289e1a2d6c127f5a333969b8a7051f98adfbe080e702c90b3001dde4759a84c89d5e7ccd7991e509492533a8753fd299aaa46080f1a SHA512 d825d9ce7501f0dfa667ad220339a1668c9472f0601a0ec7dac109af994cacfc2ce49dd01c478a47c7c25f98ba3726c735f1e7002e7b4da71451799f742a2eb1
+DIST autoconf-2.70_beta4.tar.xz 1338832 BLAKE2B 20c801e67d5aa811f0ae18dd0b5f90b843f017a584387a655541215e29f65b2c1e0145d3f436f9a9b9a5f5e35c94e52ed865e0db5b3b0c36c0e6f312e504b6e5 SHA512 e4de63c8be4736a3f864c75d3175b190067a543013935d1be1448060502c1f4c45258619dbf5d80ece96d8a0b5754a664ed084359234a427a3a08082ce12f1af
diff --git a/sys-devel/autoconf/autoconf-2.70_beta3-r1.ebuild b/sys-devel/autoconf/autoconf-2.70_beta4.ebuild
index e4079a394a27..107821eaccb6 100644
--- a/sys-devel/autoconf/autoconf-2.70_beta3-r1.ebuild
+++ b/sys-devel/autoconf/autoconf-2.70_beta4.ebuild
@@ -7,7 +7,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/autoconf.git"
 	inherit git-r3
 else
-	MY_PV="2.69d"
+	MY_PV="2.69e"
 	MY_P="${PN}-${MY_PV}"
 	SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz -> ${P}.tar.xz
 		https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz -> ${P}.tar.xz"
@@ -33,11 +33,6 @@ RDEPEND="${BDEPEND}
 [[ ${PV} == "9999" ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
 PDEPEND="emacs? ( app-emacs/autoconf-mode )"
 
-PATCHES=(
-	"${FILESDIR}/${P}-build-aux_no_transform_name.patch" #753023
-	"${FILESDIR}/${P}-build-aux_avoid_autoreconf.patch"
-)
-
 src_prepare() {
 	# usr/bin/libtool is provided by binutils-apple, need gnu libtool
 	if [[ ${CHOST} == *-darwin* ]] ; then
diff --git a/sys-devel/autoconf/files/autoconf-2.70_beta3-build-aux_avoid_autoreconf.patch b/sys-devel/autoconf/files/autoconf-2.70_beta3-build-aux_avoid_autoreconf.patch
deleted file mode 100644
index a884c503d164..000000000000
--- a/sys-devel/autoconf/files/autoconf-2.70_beta3-build-aux_avoid_autoreconf.patch
+++ /dev/null
@@ -1,272 +0,0 @@
---- autoconf-2.69d/Makefile.in
-+++ autoconf-2.69d/Makefile.in
-@@ -221,10 +221,10 @@
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
- DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
--	$(am__configure_deps) $(dist_buildaux_SCRIPTS) \
--	$(srcdir)/doc/version.texi $(srcdir)/doc/stamp-vti \
--	$(dist_lisp_LISP) $(dist_autoconflib_DATA) \
--	$(dist_autotestlib_DATA) $(dist_m4sugarlib_DATA) \
-+	$(am__configure_deps) $(srcdir)/doc/version.texi \
-+	$(srcdir)/doc/stamp-vti $(dist_lisp_LISP) \
-+	$(dist_autoconflib_DATA) $(dist_autotestlib_DATA) \
-+	$(dist_buildaux_DATA) $(dist_m4sugarlib_DATA) \
- 	$(dist_perllib_DATA) $(am__DIST_COMMON)
- am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-  configure.lineno config.status.lineno
-@@ -258,15 +258,15 @@
-     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-          $(am__cd) "$$dir" && rm -f $$files; }; \
-   }
--am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(buildauxdir)" \
--	"$(DESTDIR)$(infodir)" "$(DESTDIR)$(lispdir)" \
--	"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(autoconflibdir)" \
--	"$(DESTDIR)$(autotestlibdir)" "$(DESTDIR)$(m4sugarlibdir)" \
-+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(infodir)" \
-+	"$(DESTDIR)$(lispdir)" "$(DESTDIR)$(man1dir)" \
-+	"$(DESTDIR)$(autoconflibdir)" "$(DESTDIR)$(autotestlibdir)" \
-+	"$(DESTDIR)$(buildauxdir)" "$(DESTDIR)$(m4sugarlibdir)" \
- 	"$(DESTDIR)$(perllibdir)" "$(DESTDIR)$(autoconflibdir)" \
- 	"$(DESTDIR)$(autoscanlibdir)" "$(DESTDIR)$(autotestlibdir)" \
- 	"$(DESTDIR)$(m4sugarlibdir)" "$(DESTDIR)$(pkgdatadir)" \
- 	"$(DESTDIR)$(pkgdatadir)"
--SCRIPTS = $(bin_SCRIPTS) $(dist_buildaux_SCRIPTS) $(noinst_SCRIPTS)
-+SCRIPTS = $(bin_SCRIPTS) $(noinst_SCRIPTS)
- AM_V_P = $(am__v_P_@AM_V@)
- am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
- am__v_P_0 = false
-@@ -341,10 +341,11 @@
- NROFF = nroff
- MANS = $(dist_man_MANS)
- DATA = $(dist_autoconflib_DATA) $(dist_autotestlib_DATA) \
--	$(dist_m4sugarlib_DATA) $(dist_perllib_DATA) \
--	$(nodist_autoconflib_DATA) $(nodist_autoscanlib_DATA) \
--	$(nodist_autotestlib_DATA) $(nodist_m4sugarlib_DATA) \
--	$(nodist_pkgdata_DATA) $(pkgdata_DATA)
-+	$(dist_buildaux_DATA) $(dist_m4sugarlib_DATA) \
-+	$(dist_perllib_DATA) $(nodist_autoconflib_DATA) \
-+	$(nodist_autoscanlib_DATA) $(nodist_autotestlib_DATA) \
-+	$(nodist_m4sugarlib_DATA) $(nodist_pkgdata_DATA) \
-+	$(pkgdata_DATA)
- am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
- # Read a list of newline-separated strings from the standard input,
- # and print each of them once, without duplicates.  Input order is
-@@ -754,12 +755,23 @@
-   lib/autotest/specific.m4
- 
- nodist_autotestlib_DATA = lib/autotest/autotest.m4f
--buildauxdir = $(pkgdatadir)/build-aux
--dist_buildaux_SCRIPTS = \
-+
-+# These are declared as _DATA so that they are not subject to
-+# --program-transform-name; $(pkgdatadir) is sufficient to keep
-+# multiple installations separate, and autoreconf looks for them by
-+# their unadorned names.  However, autoreconf copies the executable
-+# bit when it copies these files into a source tree, and _DATA items
-+# are installed as not-executable, so we have to make them executable
-+# in a hook rule.
-+AUXSCRIPTS = \
-   build-aux/config.guess \
-   build-aux/config.sub \
-   build-aux/install-sh
- 
-+buildauxdir = $(pkgdatadir)/build-aux
-+dist_buildaux_DATA = \
-+  $(AUXSCRIPTS)
-+
- dist_man_MANS = \
-   man/autoconf.1 \
-   man/autoheader.1 \
-@@ -994,56 +1006,6 @@
- 	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
- 	  done; \
- 	done; rm -f c$${pid}_.???; exit $$bad
--install-dist_buildauxSCRIPTS: $(dist_buildaux_SCRIPTS)
--	@$(NORMAL_INSTALL)
--	@list='$(dist_buildaux_SCRIPTS)'; test -n "$(buildauxdir)" || list=; \
--	if test -n "$$list"; then \
--	  echo " $(MKDIR_P) '$(DESTDIR)$(buildauxdir)'"; \
--	  $(MKDIR_P) "$(DESTDIR)$(buildauxdir)" || exit 1; \
--	fi; \
--	for p in $$list; do \
--	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
--	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
--	done | \
--	sed -e 'p;s,.*/,,;n' \
--	    -e 'h;s|.*|.|' \
--	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
--	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
--	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
--	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
--	      if (++n[d] == $(am__install_max)) { \
--		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
--	    else { print "f", d "/" $$4, $$1 } } \
--	  END { for (d in files) print "f", d, files[d] }' | \
--	while read type dir files; do \
--	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
--	     test -z "$$files" || { \
--	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(buildauxdir)$$dir'"; \
--	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(buildauxdir)$$dir" || exit $$?; \
--	     } \
--	; done
--
--uninstall-dist_buildauxSCRIPTS:
--	@$(NORMAL_UNINSTALL)
--	@list='$(dist_buildaux_SCRIPTS)'; test -n "$(buildauxdir)" || exit 0; \
--	files=`for p in $$list; do echo "$$p"; done | \
--	       sed -e 's,.*/,,;$(transform)'`; \
--	dir='$(DESTDIR)$(buildauxdir)'; $(am__uninstall_files_from_dir)
--
--installcheck-dist_buildauxSCRIPTS: $(dist_buildaux_SCRIPTS)
--	bad=0; pid=$$$$; list="$(dist_buildaux_SCRIPTS)"; for p in $$list; do \
--	  case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \
--	   *" $$p "* | *" $(srcdir)/$$p "*) continue;; \
--	  esac; \
--	  f=`echo "$$p" | sed 's,^.*/,,;$(transform)'`; \
--	  for opt in --help --version; do \
--	    if "$(DESTDIR)$(buildauxdir)/$$f" $$opt >c$${pid}_.out \
--	         2>c$${pid}_.err </dev/null \
--		 && test -n "`cat c$${pid}_.out`" \
--		 && test -z "`cat c$${pid}_.err`"; then :; \
--	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
--	  done; \
--	done; rm -f c$${pid}_.???; exit $$bad
- doc/$(am__dirstamp):
- 	@$(MKDIR_P) doc
- 	@: > doc/$(am__dirstamp)
-@@ -1385,6 +1347,27 @@
- 	@list='$(dist_autotestlib_DATA)'; test -n "$(autotestlibdir)" || list=; \
- 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- 	dir='$(DESTDIR)$(autotestlibdir)'; $(am__uninstall_files_from_dir)
-+install-dist_buildauxDATA: $(dist_buildaux_DATA)
-+	@$(NORMAL_INSTALL)
-+	@list='$(dist_buildaux_DATA)'; test -n "$(buildauxdir)" || list=; \
-+	if test -n "$$list"; then \
-+	  echo " $(MKDIR_P) '$(DESTDIR)$(buildauxdir)'"; \
-+	  $(MKDIR_P) "$(DESTDIR)$(buildauxdir)" || exit 1; \
-+	fi; \
-+	for p in $$list; do \
-+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+	  echo "$$d$$p"; \
-+	done | $(am__base_list) | \
-+	while read files; do \
-+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(buildauxdir)'"; \
-+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(buildauxdir)" || exit $$?; \
-+	done
-+
-+uninstall-dist_buildauxDATA:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(dist_buildaux_DATA)'; test -n "$(buildauxdir)" || list=; \
-+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-+	dir='$(DESTDIR)$(buildauxdir)'; $(am__uninstall_files_from_dir)
- install-dist_m4sugarlibDATA: $(dist_m4sugarlib_DATA)
- 	@$(NORMAL_INSTALL)
- 	@list='$(dist_m4sugarlib_DATA)'; test -n "$(m4sugarlibdir)" || list=; \
-@@ -1794,7 +1777,7 @@
- all-am: Makefile $(INFO_DEPS) $(SCRIPTS) $(LISP) $(ELCFILES) $(MANS) \
- 		$(DATA)
- installdirs:
--	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(buildauxdir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(lispdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(autoconflibdir)" "$(DESTDIR)$(autotestlibdir)" "$(DESTDIR)$(m4sugarlibdir)" "$(DESTDIR)$(perllibdir)" "$(DESTDIR)$(autoconflibdir)" "$(DESTDIR)$(autoscanlibdir)" "$(DESTDIR)$(autotestlibdir)" "$(DESTDIR)$(m4sugarlibdir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \
-+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(lispdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(autoconflibdir)" "$(DESTDIR)$(autotestlibdir)" "$(DESTDIR)$(buildauxdir)" "$(DESTDIR)$(m4sugarlibdir)" "$(DESTDIR)$(perllibdir)" "$(DESTDIR)$(autoconflibdir)" "$(DESTDIR)$(autoscanlibdir)" "$(DESTDIR)$(autotestlibdir)" "$(DESTDIR)$(m4sugarlibdir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \
- 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
- install: $(BUILT_SOURCES)
-@@ -1858,13 +1841,14 @@
- info-am: $(INFO_DEPS)
- 
- install-data-am: install-dist_autoconflibDATA \
--	install-dist_autotestlibDATA install-dist_buildauxSCRIPTS \
-+	install-dist_autotestlibDATA install-dist_buildauxDATA \
- 	install-dist_lispLISP install-dist_m4sugarlibDATA \
- 	install-dist_perllibDATA install-info-am install-man \
- 	install-nodist_autoconflibDATA install-nodist_autoscanlibDATA \
- 	install-nodist_autotestlibDATA install-nodist_m4sugarlibDATA \
- 	install-nodist_pkgdataDATA install-pkgdataDATA
--
-+	@$(NORMAL_INSTALL)
-+	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
- install-dvi: install-dvi-am
- 
- install-dvi-am: $(DVIS)
-@@ -1980,8 +1964,7 @@
- 	while read files; do \
- 	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(psdir)'"; \
- 	  $(INSTALL_DATA) $$files "$(DESTDIR)$(psdir)" || exit $$?; done
--installcheck-am: installcheck-binSCRIPTS \
--	installcheck-dist_buildauxSCRIPTS installcheck-local
-+installcheck-am: installcheck-binSCRIPTS installcheck-local
- 
- maintainer-clean: maintainer-clean-am
- 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-@@ -2003,7 +1986,7 @@
- ps-am: $(PSS)
- 
- uninstall-am: uninstall-binSCRIPTS uninstall-dist_autoconflibDATA \
--	uninstall-dist_autotestlibDATA uninstall-dist_buildauxSCRIPTS \
-+	uninstall-dist_autotestlibDATA uninstall-dist_buildauxDATA \
- 	uninstall-dist_lispLISP uninstall-dist_m4sugarlibDATA \
- 	uninstall-dist_perllibDATA uninstall-dvi-am uninstall-html-am \
- 	uninstall-info-am uninstall-man \
-@@ -2015,7 +1998,8 @@
- 
- uninstall-man: uninstall-man1
- 
--.MAKE: all check check-am install install-am install-strip
-+.MAKE: all check check-am install install-am install-data-am \
-+	install-strip
- 
- .PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-am \
- 	check-local clean clean-aminfo clean-cscope clean-generic \
-@@ -2026,24 +2010,24 @@
- 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
- 	dvi-am html html-am info info-am install install-am \
- 	install-binSCRIPTS install-data install-data-am \
--	install-dist_autoconflibDATA install-dist_autotestlibDATA \
--	install-dist_buildauxSCRIPTS install-dist_lispLISP \
--	install-dist_m4sugarlibDATA install-dist_perllibDATA \
--	install-dvi install-dvi-am install-exec install-exec-am \
--	install-html install-html-am install-info install-info-am \
--	install-man install-man1 install-nodist_autoconflibDATA \
--	install-nodist_autoscanlibDATA install-nodist_autotestlibDATA \
--	install-nodist_m4sugarlibDATA install-nodist_pkgdataDATA \
--	install-pdf install-pdf-am install-pkgdataDATA install-ps \
--	install-ps-am install-strip installcheck installcheck-am \
--	installcheck-binSCRIPTS installcheck-dist_buildauxSCRIPTS \
-+	install-data-hook install-dist_autoconflibDATA \
-+	install-dist_autotestlibDATA install-dist_buildauxDATA \
-+	install-dist_lispLISP install-dist_m4sugarlibDATA \
-+	install-dist_perllibDATA install-dvi install-dvi-am \
-+	install-exec install-exec-am install-html install-html-am \
-+	install-info install-info-am install-man install-man1 \
-+	install-nodist_autoconflibDATA install-nodist_autoscanlibDATA \
-+	install-nodist_autotestlibDATA install-nodist_m4sugarlibDATA \
-+	install-nodist_pkgdataDATA install-pdf install-pdf-am \
-+	install-pkgdataDATA install-ps install-ps-am install-strip \
-+	installcheck installcheck-am installcheck-binSCRIPTS \
- 	installcheck-local installdirs maintainer-clean \
- 	maintainer-clean-aminfo maintainer-clean-generic \
- 	maintainer-clean-vti mostlyclean mostlyclean-aminfo \
- 	mostlyclean-generic mostlyclean-vti pdf pdf-am ps ps-am tags \
- 	tags-am uninstall uninstall-am uninstall-binSCRIPTS \
- 	uninstall-dist_autoconflibDATA uninstall-dist_autotestlibDATA \
--	uninstall-dist_buildauxSCRIPTS uninstall-dist_lispLISP \
-+	uninstall-dist_buildauxDATA uninstall-dist_lispLISP \
- 	uninstall-dist_m4sugarlibDATA uninstall-dist_perllibDATA \
- 	uninstall-dvi-am uninstall-html-am uninstall-info-am \
- 	uninstall-man uninstall-man1 uninstall-nodist_autoconflibDATA \
-@@ -2200,6 +2184,14 @@
- 
- lib/autotest/autotest.m4f: $(autotest_m4f_dependencies)
- 
-+install-data-hook: install-data-hook-make-aux-scripts-executable
-+install-data-hook-make-aux-scripts-executable:
-+	for s in $(AUXSCRIPTS); do \
-+	  chmod +x "$(DESTDIR)$(pkgdatadir)/$$s"; \
-+	done
-+
-+.PHONY: install-data-hook install-data-hook-make-aux-scripts-executable
-+
- man/autoconf.1:   $(common_dep) man/autoconf.w   man/autoconf.x   $(binsrcdir)/autoconf.as
- man/autoheader.1: $(common_dep) man/autoheader.w man/autoheader.x $(binsrcdir)/autoheader.in
- man/autom4te.1:   $(common_dep) man/autom4te.w   man/autom4te.x   $(binsrcdir)/autom4te.in
diff --git a/sys-devel/autoconf/files/autoconf-2.70_beta3-build-aux_no_transform_name.patch b/sys-devel/autoconf/files/autoconf-2.70_beta3-build-aux_no_transform_name.patch
deleted file mode 100644
index 079fa15306ca..000000000000
--- a/sys-devel/autoconf/files/autoconf-2.70_beta3-build-aux_no_transform_name.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 0f7e5a5477f97b8a105d563bc7590ebefaff854d Mon Sep 17 00:00:00 2001
-From: Zack Weinberg <zackw@panix.com>
-Date: Thu, 5 Nov 2020 10:19:26 -0500
-Subject: Do not apply --program-transform-name to build-aux scripts.
-
-autoreconf expects to find $(pkgdatadir)/build-aux/config.sub etc
-under those names, not names modified by --program-transform-name.
-Placing them in $(pkgdatadir) is sufficient to keep parallel
-installations of autoconf separate: anyone doing that would need
-to adjust @PACKAGE@ anyway.
-
-* lib/local.mk: Use a _DATA rule, not a _SCRIPTS rule, to install
-  config.guess, config.sub, and install-sh.
-  (install-data-hook-make-aux-scripts-executable): New hook rule.
----
- lib/local.mk | 23 +++++++++++++++++++++--
- 1 file changed, 21 insertions(+), 2 deletions(-)
-
-diff --git a/lib/local.mk b/lib/local.mk
-index d4ecf3cb..e380403f 100644
---- a/lib/local.mk
-+++ b/lib/local.mk
-@@ -201,8 +201,27 @@ lib/autotest/autotest.m4f: $(autotest_m4f_dependencies)
- ## Install auxiliary scripts.  ##
- ## --------------------------- ##
- 
--buildauxdir = $(pkgdatadir)/build-aux
--dist_buildaux_SCRIPTS = \
-+# These are declared as _DATA so that they are not subject to
-+# --program-transform-name; $(pkgdatadir) is sufficient to keep
-+# multiple installations separate, and autoreconf looks for them by
-+# their unadorned names.  However, autoreconf copies the executable
-+# bit when it copies these files into a source tree, and _DATA items
-+# are installed as not-executable, so we have to make them executable
-+# in a hook rule.
-+
-+AUXSCRIPTS = \
-   build-aux/config.guess \
-   build-aux/config.sub \
-   build-aux/install-sh
-+
-+buildauxdir = $(pkgdatadir)/build-aux
-+dist_buildaux_DATA = \
-+  $(AUXSCRIPTS)
-+
-+install-data-hook: install-data-hook-make-aux-scripts-executable
-+install-data-hook-make-aux-scripts-executable:
-+	for s in $(AUXSCRIPTS); do \
-+	  chmod +x "$(DESTDIR)$(pkgdatadir)/$$s"; \
-+	done
-+
-+.PHONY: install-data-hook install-data-hook-make-aux-scripts-executable
--- 
-cgit v1.2.1
-