mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-05 22:20:24 -08:00
Code Issues Projects Releases Wiki Activity

Yet another fix for autogen.sh

Browse source 
* 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.
This commit is contained in:
Eli Zaretskii 2017-01-05 21:36:58 +02:00
parent 99af58d74e
commit ade6a024c8
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
autogen.sh
View file

@ -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

2
nt/Makefile.in
View file

@ -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 $@