aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2017-01-04 00:44:45 -0800
committerPaul Eggert2017-01-04 00:45:14 -0800
commit44c588a25ce231ce05fb535cd6d7162e91214f45 (patch)
treec23bf3f31f57dee2f0cce6b9a60915006cbc53c3
parent2ec41c415f39990561cc9da4c9bad0b69bfad489 (diff)
downloademacs-44c588a25ce231ce05fb535cd6d7162e91214f45.tar.gz
emacs-44c588a25ce231ce05fb535cd6d7162e91214f45.zip
Port recent autogen.sh changes to Darwin
Problem reported by Sam Steingold (Bug#25347). * autogen.sh: Don't assume 'sed -f-' reads a script from stdin, as POSIX does not require it and it does not work on Darwin.
-rwxr-xr-xautogen.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/autogen.sh b/autogen.sh
index 91e1e2cea23..f6bfde6afb2 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -223,7 +223,10 @@ Please report any problems with this script to bug-gnu-emacs@gnu.org .'
223 223
224 ## Create nt/gnulib.mk if it doesn't exist, as autoreconf will need it. 224 ## Create nt/gnulib.mk if it doesn't exist, as autoreconf will need it.
225 if test ! -f nt/gnulib.mk; then 225 if test ! -f nt/gnulib.mk; then
226 sed '/^[^#]/s|^.*$|/^## begin *gnulib module &/,/^## end *gnulib module &/c ## gnulib module & removed|' nt/gnulib-modules-to-delete.cfg | sed -f- lib/gnulib.mk > nt/gnulib.mk 226 echo 'Inferring nt/gnulib.mk from lib/gnulib.mk ...'
227 metascript='/^[^#]/s|^.*$|/^## begin *gnulib module &/,/^## end *gnulib module &/c ## gnulib module & removed|'
228 script=`sed "$metascript" nt/gnulib-modules-to-delete.cfg` || exit
229 sed "$script" lib/gnulib.mk > nt/gnulib.mk || exit
227 fi 230 fi
228 231
229 echo "Running 'autoreconf -fi -I m4' ..." 232 echo "Running 'autoreconf -fi -I m4' ..."