diff options
| author | Paul Eggert | 2022-02-24 10:12:50 -0800 |
|---|---|---|
| committer | Paul Eggert | 2022-02-24 10:13:08 -0800 |
| commit | bd17fa2c7565f180cedbfa396c0b159e144178cb (patch) | |
| tree | 724e44ca9ee1f53610ceddb92cd1aa7d3fb98efa | |
| parent | 6092ee1c3ff503fbe8087e13b7eae2f904c4af3b (diff) | |
| download | emacs-bd17fa2c7565f180cedbfa396c0b159e144178cb.tar.gz emacs-bd17fa2c7565f180cedbfa396c0b159e144178cb.zip | |
* admin/merge-gnulib: fix bare checkout (Bug#32452#65)
| -rwxr-xr-x | admin/merge-gnulib | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/admin/merge-gnulib b/admin/merge-gnulib index 4045eabf4e4..4aabffa0dcd 100755 --- a/admin/merge-gnulib +++ b/admin/merge-gnulib | |||
| @@ -102,6 +102,9 @@ test -x "$gnulib_srcdir"/gnulib-tool || { | |||
| 102 | exit 1 | 102 | exit 1 |
| 103 | } | 103 | } |
| 104 | 104 | ||
| 105 | # gnulib-tool has problems with a bare checkout (Bug#32452#65). | ||
| 106 | test -f configure || ./autogen.sh | ||
| 107 | |||
| 105 | avoided_flags= | 108 | avoided_flags= |
| 106 | for module in $AVOIDED_MODULES; do | 109 | for module in $AVOIDED_MODULES; do |
| 107 | avoided_flags="$avoided_flags --avoid=$module" | 110 | avoided_flags="$avoided_flags --avoid=$module" |