[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117372: Diagnose failures due to colons in director
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] trunk r117372: Diagnose failures due to colons in directory names. |
Date: |
Fri, 20 Jun 2014 16:05:15 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117372
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17278
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Fri 2014-06-20 09:05:10 -0700
message:
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.
modified:
ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1538
Makefile.in makefile.in-20091113204419-o5vbwnq5f7feedwu-446
configure.ac
configure.in-20091113204419-o5vbwnq5f7feedwu-783
=== modified file 'ChangeLog'
--- a/ChangeLog 2014-06-17 16:09:19 +0000
+++ b/ChangeLog 2014-06-20 16:05:10 +0000
@@ -1,3 +1,10 @@
+2014-06-20 Paul Eggert <address@hidden>
+
+ 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 <address@hidden>
Omit redundant extern decls.
=== modified file 'Makefile.in'
--- a/Makefile.in 2014-06-15 00:34:22 +0000
+++ b/Makefile.in 2014-06-20 16:05:10 +0000
@@ -297,6 +297,14 @@
# to just letting configure generate epaths.h from epaths.in in a
# similar way to how Makefile is made from Makefile.in.
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}` ; \
locallisppath=`echo "${locallisppath}" | ${removenullpaths}` ; \
buildlisppath=`echo "${buildlisppath}" | ${removenullpaths}` ; \
=== modified file 'configure.ac'
--- a/configure.ac 2014-06-17 16:09:19 +0000
+++ b/configure.ac 2014-06-20 16:05:10 +0000
@@ -5121,7 +5121,7 @@
${MAKE-make} MAKEFILE_NAME=do-not-make-Makefile epaths-force-w32
else
${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"])
dnl NB we have to cheat and use the ac_... version because abs_top_srcdir
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117372: Diagnose failures due to colons in directory names.,
Paul Eggert <=