[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master ee51550: Fix generation of nt/gnulib.mk on macOS
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] master ee51550: Fix generation of nt/gnulib.mk on macOS |
Date: |
Sat, 11 Mar 2017 06:35:26 -0500 (EST) |
branch: master
commit ee51550c3951a47446ec85cb7f0b1ea7a898acaf
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
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)
---
nt/Makefile.in | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/nt/Makefile.in b/nt/Makefile.in
index 34c552c..90ca6b8 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 > address@hidden && \
- ${srcdir}/../build-aux/move-if-change address@hidden $@
+ $(AM_V_GEN)sed '/^[^#]/s|^.*$$|/^## begin *gnulib module &/,/^## end
*gnulib module &/d|' < $< > t-gnulib.mk && \
+ sed -f t-gnulib.mk ${srcdir}/../lib/gnulib.mk > address@hidden && \
+ ${srcdir}/../build-aux/move-if-change address@hidden $@ && \
+ rm -f t-gnulib.mk
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master ee51550: Fix generation of nt/gnulib.mk on macOS,
Eli Zaretskii <=