diff options
| author | Paul Eggert | 2014-06-20 09:05:10 -0700 |
|---|---|---|
| committer | Paul Eggert | 2014-06-20 09:05:10 -0700 |
| commit | 539ad293eb36b4cf458cbdb5a6b37f5cd1bb68a1 (patch) | |
| tree | 1a0840c2a54e6d39b1a5541c1ff7fa763ead4182 /Makefile.in | |
| parent | cb5f7e19f2e71dec8cae189c7233f31610d543aa (diff) | |
| download | emacs-539ad293eb36b4cf458cbdb5a6b37f5cd1bb68a1.tar.gz emacs-539ad293eb36b4cf458cbdb5a6b37f5cd1bb68a1.zip | |
Diagnose failures due to colons in directory names.
* 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
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in index 7104ef82744..1a7acef0c5a 100644 --- a/Makefile.in +++ b/Makefile.in | |||
| @@ -297,6 +297,14 @@ removenullpaths=sed -e 's/^:*//' -e 's/:*$$//g' -e 's/::*/:/g' | |||
| 297 | # to just letting configure generate epaths.h from epaths.in in a | 297 | # to just letting configure generate epaths.h from epaths.in in a |
| 298 | # similar way to how Makefile is made from Makefile.in. | 298 | # similar way to how Makefile is made from Makefile.in. |
| 299 | epaths-force: | 299 | epaths-force: |
| 300 | @for dir in '$(abs_srcdir)' '$(lispdir)' '$(archlibdir)'; do \ | ||
| 301 | case $$dir in \ | ||
| 302 | *:*) \ | ||
| 303 | echo >&2 "Build or installation directory '$$dir'"; \ | ||
| 304 | echo >&2 "cannot contain ':'."; \ | ||
| 305 | exit 1;; \ | ||
| 306 | esac; \ | ||
| 307 | done | ||
| 300 | @(standardlisppath=`echo "${standardlisppath}" | ${removenullpaths}` ; \ | 308 | @(standardlisppath=`echo "${standardlisppath}" | ${removenullpaths}` ; \ |
| 301 | locallisppath=`echo "${locallisppath}" | ${removenullpaths}` ; \ | 309 | locallisppath=`echo "${locallisppath}" | ${removenullpaths}` ; \ |
| 302 | buildlisppath=`echo "${buildlisppath}" | ${removenullpaths}` ; \ | 310 | buildlisppath=`echo "${buildlisppath}" | ${removenullpaths}` ; \ |