diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2024-01-20 16:26:45 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2024-01-20 16:35:24 -0800 |
| commit | afc9cd1721c586f960af5e324a61418775ac4543 (patch) | |
| tree | ac2217ecd93a0f3386d2291e057ba1be435d06c1 /admin | |
| parent | 54d3de64e1902402a8e7dbb2991f360397281a9e (diff) | |
| download | emacs-afc9cd1721c586f960af5e324a61418775ac4543.tar.gz | |
Fix autogen.sh’s spurious ‘git diff’ output
Problem reported by Gerd Möllmann (Bug#68464).
* .gitignore: Ignore files in exec that are now copied from build-aux.
* admin/merge-gnulib (avoided_flags): Instead of clearing
autom4te.cache here ...
* autogen.sh (do_git): ... clear it here.
Use config.guess, config.sub and install-sh from
the Emacs repository, as they are more likely to be up to date.
This avoids unnecessary differences among different builders,
and avoids unnecessary ‘git diff’ output after autogen.sh.
Also, copy these files from build-aux to exec since there
should be no difference between the two copies.
* exec/config.guess, exec/config.sub, exec/install-sh:
Remove from repository, as autogen.sh now copies them from build-aux.
Diffstat (limited to 'admin')
| -rwxr-xr-x | admin/merge-gnulib | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/admin/merge-gnulib b/admin/merge-gnulib index edaa1e08b57..5246fb14e1e 100755 --- a/admin/merge-gnulib +++ b/admin/merge-gnulib @@ -107,9 +107,6 @@ test -x "$gnulib_srcdir"/gnulib-tool || { # gnulib-tool has problems with a bare checkout (Bug#32452#65). test -f configure || ./autogen.sh || exit -# Old caches can confuse autoconf when some Gnulib-related changes take effect. -rm -fr autom4te.cache || exit - avoided_flags= for module in $AVOIDED_MODULES; do avoided_flags="$avoided_flags --avoid=$module" |