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 5d6512760d9..1e3b7599626 100755 --- a/admin/merge-gnulib +++ b/admin/merge-gnulib | |||
| @@ -44,7 +44,7 @@ GNULIB_MODULES=' | |||
| 44 | 44 | ||
| 45 | GNULIB_TOOL_FLAGS=' | 45 | GNULIB_TOOL_FLAGS=' |
| 46 | --avoid=close --avoid=dup | 46 | --avoid=close --avoid=dup |
| 47 | --avoid=fchdir --avoid=flexmember --avoid=fstat | 47 | --avoid=fchdir --avoid=fstat |
| 48 | --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow | 48 | --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow |
| 49 | --avoid=open --avoid=openat-die --avoid=opendir | 49 | --avoid=open --avoid=openat-die --avoid=opendir |
| 50 | --avoid=raise | 50 | --avoid=raise |
| @@ -93,7 +93,8 @@ test -x "$gnulib_srcdir"/gnulib-tool || { | |||
| 93 | } | 93 | } |
| 94 | 94 | ||
| 95 | "$gnulib_srcdir"/gnulib-tool --dir="$src" $GNULIB_TOOL_FLAGS $GNULIB_MODULES && | 95 | "$gnulib_srcdir"/gnulib-tool --dir="$src" $GNULIB_TOOL_FLAGS $GNULIB_MODULES && |
| 96 | rm -- "$src"lib/gl_openssl.h "$src"m4/fcntl-o.m4 "$src"m4/gl-openssl.m4 \ | 96 | rm -- "$src"lib/gl_openssl.h "$src"m4/fcntl-o.m4 "$src"m4/flexmember.m4 \ |
| 97 | "$src"m4/gl-openssl.m4 \ | ||
| 97 | "$src"m4/gnulib-cache.m4"$src" m4/warn-on-use.m4 && | 98 | "$src"m4/gnulib-cache.m4"$src" m4/warn-on-use.m4 && |
| 98 | cp -- "$gnulib_srcdir"/build-aux/texinfo.tex "$src"doc/misc && | 99 | cp -- "$gnulib_srcdir"/build-aux/texinfo.tex "$src"doc/misc && |
| 99 | cp -- "$gnulib_srcdir"/build-aux/move-if-change "$src"build-aux && | 100 | cp -- "$gnulib_srcdir"/build-aux/move-if-change "$src"build-aux && |