diff options
| author | Gary V. Vaughan <gary@gnu.org> | 2013-03-08 23:19:21 +0700 |
|---|---|---|
| committer | Gary V. Vaughan <gary@gnu.org> | 2013-03-08 23:24:46 +0700 |
| commit | d84d56e5a5fc13f8598fb78c69cb3811f6a1b8e8 (patch) | |
| tree | 1c02e2a703a732ccf4fbf1bab8a04870713430b1 | |
| parent | a82e6b74a462b16effb7304b850f72faf727aec5 (diff) | |
| download | m4-d84d56e5a5fc13f8598fb78c69cb3811f6a1b8e8.tar.gz | |
bootstrap: remove reintroduced CVS cruft.
* bootstrap.conf (m4_ignore_gnulib_ignore): Remove.
The code this was factored from was removed between making the
bootstrap branch, and merging, so this function is actually
obsolete.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | bootstrap.conf | 27 |
2 files changed, 6 insertions, 27 deletions
@@ -1,5 +1,11 @@ 2013-03-08 Gary V. Vaughan <gary@gnu.org> + bootstrap: remove reintroduced CVS cruft. + * bootstrap.conf (m4_ignore_gnulib_ignore): Remove. + The code this was factored from was removed between making the + bootstrap branch, and merging, so this function is actually + obsolete. + maint: automake 1.11.5 and earlier generate insecure dist rules. * configure.ac (AM_INIT_AUTOMAKE): Require 1.11.5 or newer. diff --git a/bootstrap.conf b/bootstrap.conf index 7440bc05..b267d16b 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -60,33 +60,6 @@ vc_ignore=".cvsignore .gitignore" ## Hook functions. ## ## --------------- ## -# m4_ignore_gnulib_ignore -# ----------------------- -# gnulib-tool updates m4/.gitignore and lib/.gitignore, and keeping -# generated files under version control does not make sense. Since -# lib is entirely ignored, we only need to prepopulate the m4 ignore -# files with generated files not tracked by gnulib-tool. -m4_ignore_gnulib_ignore () -{ - $debug_cmd - - $require_macro_dir - - if test -f "$macro_dir/.gitignore" ; then - : - else - func_echo "creating initial \`$macro_dir/.gitignore'" - cat > $macro_dir/.gitignore <<\EOF -# files created by gnulib, but that gnulib doesn't track -*~ -.gitignore -gnulib-comp.m4 -EOF - fi -} -func_add_hook func_prep m4_ignore_gnulib_ignore - - # m4_install_texinfo_diff_driver # ------------------------------ # Help git to do a better job of merging texinfo files. |