diff options
Diffstat (limited to 'admin')
| -rwxr-xr-x | admin/merge-gnulib | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/admin/merge-gnulib b/admin/merge-gnulib index 7e7971fe881..76918f3d34f 100755 --- a/admin/merge-gnulib +++ b/admin/merge-gnulib | |||
| @@ -40,7 +40,7 @@ GNULIB_MODULES=' | |||
| 40 | sig2str socklen stat-time std-gnu11 stdalign stddef stdio | 40 | sig2str socklen stat-time std-gnu11 stdalign stddef stdio |
| 41 | stpcpy strftime strtoimax strtoumax symlink sys_stat | 41 | stpcpy strftime strtoimax strtoumax symlink sys_stat |
| 42 | sys_time time time_r time_rz timegm timer-time timespec-add timespec-sub | 42 | sys_time time time_r time_rz timegm timer-time timespec-add timespec-sub |
| 43 | unsetenv update-copyright utimens | 43 | update-copyright utimens |
| 44 | vla warnings | 44 | vla warnings |
| 45 | ' | 45 | ' |
| 46 | 46 | ||
| @@ -97,7 +97,8 @@ test -x "$gnulib_srcdir"/gnulib-tool || { | |||
| 97 | "$gnulib_srcdir"/gnulib-tool --dir="$src" $GNULIB_TOOL_FLAGS $GNULIB_MODULES && | 97 | "$gnulib_srcdir"/gnulib-tool --dir="$src" $GNULIB_TOOL_FLAGS $GNULIB_MODULES && |
| 98 | rm -- "$src"lib/gl_openssl.h "$src"m4/fcntl-o.m4 \ | 98 | rm -- "$src"lib/gl_openssl.h "$src"m4/fcntl-o.m4 \ |
| 99 | "$src"m4/gl-openssl.m4 \ | 99 | "$src"m4/gl-openssl.m4 \ |
| 100 | "$src"m4/gnulib-cache.m4 "$src"m4/warn-on-use.m4 "$src"m4/wint_t.m4 && | 100 | "$src"m4/gnulib-cache.m4 "$src"m4/gnulib-tool.m4 \ |
| 101 | "$src"m4/warn-on-use.m4 "$src"m4/wint_t.m4 && | ||
| 101 | cp -- "$gnulib_srcdir"/build-aux/texinfo.tex "$src"doc/misc && | 102 | cp -- "$gnulib_srcdir"/build-aux/texinfo.tex "$src"doc/misc && |
| 102 | cp -- "$gnulib_srcdir"/build-aux/move-if-change "$src"build-aux && | 103 | cp -- "$gnulib_srcdir"/build-aux/move-if-change "$src"build-aux && |
| 103 | { test -z "$src" || cd "$src"; } && | 104 | { test -z "$src" || cd "$src"; } && |