masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-03 19:03:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Diagnose failures due to colons in directory names.

Browse source 
* Makefile.in (epaths-force): Don't allow ':' in directories whose
names go into a colon-separated path.
* configure.ac: Fail if submake fails.

Fixes: debbugs:17278
This commit is contained in:
Paul Eggert 2014-06-20 09:05:10 -07:00
parent cb5f7e19f2
commit 539ad293eb
3 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2014-06-20 Paul Eggert <eggert@cs.ucla.edu>
Diagnose failures due to colons in directory names (Bug#17278).
* Makefile.in (epaths-force): Don't allow ':' in directories whose
names go into a colon-separated path.
* configure.ac: Fail if submake fails.
2014-06-17 Paul Eggert <eggert@cs.ucla.edu> 2014-06-17 Paul Eggert <eggert@cs.ucla.edu>
Omit redundant extern decls. Omit redundant extern decls.

8
Makefile.in
View file

@ -297,6 +297,14 @@ removenullpaths=sed -e 's/^:*//' -e 's/:*$$//g' -e 's/::*/:/g'
# to just letting configure generate epaths.h from epaths.in in a # to just letting configure generate epaths.h from epaths.in in a
# similar way to how Makefile is made from Makefile.in. # similar way to how Makefile is made from Makefile.in.
epaths-force: epaths-force:
@for dir in '$(abs_srcdir)' '$(lispdir)' '$(archlibdir)'; do \
case $$dir in \
*:*) \
echo >&2 "Build or installation directory '$$dir'"; \
echo >&2 "cannot contain ':'."; \
exit 1;; \
esac; \
done
@(standardlisppath=`echo "${standardlisppath}" | ${removenullpaths}` ; \ @(standardlisppath=`echo "${standardlisppath}" | ${removenullpaths}` ; \
locallisppath=`echo "${locallisppath}" | ${removenullpaths}` ; \ locallisppath=`echo "${locallisppath}" | ${removenullpaths}` ; \
buildlisppath=`echo "${buildlisppath}" | ${removenullpaths}` ; \ buildlisppath=`echo "${buildlisppath}" | ${removenullpaths}` ; \

2
configure.ac
View file

@ -5121,7 +5121,7 @@ if test "${opsys}" = "mingw32"; then
${MAKE-make} MAKEFILE_NAME=do-not-make-Makefile epaths-force-w32 ${MAKE-make} MAKEFILE_NAME=do-not-make-Makefile epaths-force-w32
else else
${MAKE-make} MAKEFILE_NAME=do-not-make-Makefile epaths-force ${MAKE-make} MAKEFILE_NAME=do-not-make-Makefile epaths-force
fi fi || AC_MSG_ERROR(['src/epaths.h' could not be made.])
], [GCC="$GCC" CPPFLAGS="$CPPFLAGS" opsys="$opsys"]) ], [GCC="$GCC" CPPFLAGS="$CPPFLAGS" opsys="$opsys"])
dnl NB we have to cheat and use the ac_... version because abs_top_srcdir dnl NB we have to cheat and use the ac_... version because abs_top_srcdir