diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2017-01-05 21:36:58 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2017-01-05 21:36:58 +0200 |
| commit | ade6a024c80dbb0b66d9d2e10ccd350618036e78 (patch) | |
| tree | 045ac14daccc0a319fc008ed0349e7acf7d0ab10 | |
| parent | 99af58d74e431da6b55f21272bf72a9f56ce0900 (diff) | |
| download | emacs-ade6a024c80dbb0b66d9d2e10ccd350618036e78.tar.gz | |
Yet another fix for autogen.sh
* autogen.sh (gnulib.mk): Make the Sed script more portable.
* nt/Makefile.in (${srcdir}/gnulib.mk): Adapt the Sed command to
the changes in autogen.sh.
| -rwxr-xr-x | autogen.sh | 6 | ||||
| -rw-r--r-- | nt/Makefile.in | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/autogen.sh b/autogen.sh index 47e518ccf68..e5b3eadf33e 100755 --- a/autogen.sh +++ b/autogen.sh @@ -224,10 +224,8 @@ Please report any problems with this script to bug-gnu-emacs@gnu.org .' ## Create nt/gnulib.mk if it doesn't exist, as autoreconf will need it. if test ! -f nt/gnulib.mk; then echo 'Inferring nt/gnulib.mk from lib/gnulib.mk ...' - echo '/^[^#]/s|^.*$|/^## begin *gnulib module &/,/^## end *gnulib module &/c\\\' > metascript.$$ - echo '## gnulib module & removed|' >> metascript.$$ - script=`sed -f metascript.$$ nt/gnulib-modules-to-delete.cfg` || exit - rm -f metascript.$$ + metascript='/^[^#]/s|^.*$|/^## begin *gnulib module &/,/^## end *gnulib module &/d|' + script=`sed "$metascript" nt/gnulib-modules-to-delete.cfg` || exit sed "$script" lib/gnulib.mk > nt/gnulib.mk || exit fi diff --git a/nt/Makefile.in b/nt/Makefile.in index 89f44606d70..34c552ca262 100644 --- a/nt/Makefile.in +++ b/nt/Makefile.in @@ -262,6 +262,6 @@ 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 &/c ## gnulib module & removed|' < $< | \ + $(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 $@ |