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 @@
+2013-07-10  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * Makefile.in (removenullpaths): Remove adjacent null paths (Bug#14835).
+
 2013-07-09  Peter Rosin  <peda@lysator.liu.se>  (tiny change>
 
         * 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}
 
 .PHONY: all ${SUBDIR} blessmail epaths-force epaths-force-w32 FRC
 
-removenullpaths=sed -e 's/^://g' -e 's/:$$//g' -e 's/::/:/g'
+removenullpaths=sed -e 's/^:*//' -e 's/:*$$//g' -e 's/::*/:/g'
 
 # Generate epaths.h from epaths.in.  This target is invoked by `configure'.
 # See comments in configure.ac for why it is done this way, as opposed