mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-15 10:30:25 -08:00
Update from Gnulib by running admin/merge-gnulib
The following changes were made by hand, so that admin/merge-gnulib could succeed instead of failing because the diff didn’t match. * admin/gnulib-patches/lib/getloadavg.c.diff: Remove, as it is no longer needed now that recent Gnulib has been merged. * admin/merge-gnulib (GNULIB_TOOL_FLAGS): Remove the --local-dir="$src"admin/gnulib-patches option, as it is no longer needed either.
This commit is contained in:
parent
322ed637b4
commit
c9c6abfa81
14 changed files with 141 additions and 52 deletions
|
|
@ -80,10 +80,6 @@ case $src in
|
|||
*) src=$src/ ;;
|
||||
esac
|
||||
|
||||
GNULIB_TOOL_FLAGS="$GNULIB_TOOL_FLAGS
|
||||
--local-dir="$src"admin/gnulib-patches
|
||||
"
|
||||
|
||||
# Gnulib's source directory.
|
||||
gnulib_srcdir=${1-$src../gnulib}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue