aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2013-07-09 23:41:37 -0700
committerPaul Eggert2013-07-09 23:41:37 -0700
commitc6e7fc0ea726804caa6cbfc673ddeba10bd28ae3 (patch)
treeb4935410221e7ffc72a787b9dd40b7ea41a4207a
parent954b166e9037de5fdd43b4fbe7b8c73a36ac402e (diff)
downloademacs-c6e7fc0ea726804caa6cbfc673ddeba10bd28ae3.tar.gz
emacs-c6e7fc0ea726804caa6cbfc673ddeba10bd28ae3.zip
* Makefile.in (removenullpaths): Remove adjacent null paths.
Fixes: debbugs:14835
-rw-r--r--ChangeLog4
-rw-r--r--Makefile.in2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 579cd128ca4..ea9afc289e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12013-07-10 Paul Eggert <eggert@cs.ucla.edu>
2
3 * Makefile.in (removenullpaths): Remove adjacent null paths (Bug#14835).
4
12013-07-09 Peter Rosin <peda@lysator.liu.se> (tiny change> 52013-07-09 Peter Rosin <peda@lysator.liu.se> (tiny change>
2 6
3 * configure.ac (HAVE_W32): Avoid nested functions (the second 7 * configure.ac (HAVE_W32): Avoid nested functions (the second
diff --git a/Makefile.in b/Makefile.in
index 4afe6746cfc..a5accbf04a9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -293,7 +293,7 @@ all: ${SUBDIR}
293 293
294.PHONY: all ${SUBDIR} blessmail epaths-force epaths-force-w32 FRC 294.PHONY: all ${SUBDIR} blessmail epaths-force epaths-force-w32 FRC
295 295
296removenullpaths=sed -e 's/^://g' -e 's/:$$//g' -e 's/::/:/g' 296removenullpaths=sed -e 's/^:*//' -e 's/:*$$//g' -e 's/::*/:/g'
297 297
298# Generate epaths.h from epaths.in. This target is invoked by `configure'. 298# Generate epaths.h from epaths.in. This target is invoked by `configure'.
299# See comments in configure.ac for why it is done this way, as opposed 299# See comments in configure.ac for why it is done this way, as opposed