From: Eli Zaretskii Date: Sat, 11 Mar 2017 11:34:08 +0000 (+0200) Subject: Fix generation of nt/gnulib.mk on macOS X-Git-Tag: emacs-26.0.90~595 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ee51550c3951a47446ec85cb7f0b1ea7a898acaf;p=emacs.git Fix generation of nt/gnulib.mk on macOS * nt/Makefile.in (${srcdir}/gnulib.mk): Don't use the -f- option to Sed, as that is not portable with non-GNU Sed variants. (Bug#26043) --- diff --git a/nt/Makefile.in b/nt/Makefile.in index 34c552ca262..90ca6b85f74 100644 --- a/nt/Makefile.in +++ b/nt/Makefile.in @@ -262,6 +262,7 @@ emacs.res ../src/emacs.res: emacs.rc ${srcdir}/icons/emacs.ico \ $(AM_V_RC)${WINDRES} -I ${srcdir} -O coff -o $@ $< ${srcdir}/gnulib.mk: ${srcdir}/gnulib-modules-to-delete.cfg ${srcdir}/../lib/gnulib.mk - $(AM_V_GEN)sed '/^[^#]/s|^.*$$|/^## begin *gnulib module &/,/^## end *gnulib module &/d|' < $< | \ - sed -f- ${srcdir}/../lib/gnulib.mk > $@-t && \ - ${srcdir}/../build-aux/move-if-change $@-t $@ + $(AM_V_GEN)sed '/^[^#]/s|^.*$$|/^## begin *gnulib module &/,/^## end *gnulib module &/d|' < $< > t-gnulib.mk && \ + sed -f t-gnulib.mk ${srcdir}/../lib/gnulib.mk > $@-t && \ + ${srcdir}/../build-aux/move-if-change $@-t $@ && \ + rm -f t-gnulib.mk