From 0b00899d21d79f04343432ad42a07a59747705fc Mon Sep 17 00:00:00 2001
From: Xuefer <xuefer@gmail.com>
Date: Thu, 10 Oct 2013 07:42:34 +0000
Subject: [PATCH] merge from trunk, fixed #330: fix win32 build with no
 indent.exe nor cat.exe

git-svn-id: svn://svn.lighttpd.net/xcache/branches/3.0@1419 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
---
 ChangeLog  | 2 ++
 config.w32 | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f2f0ae1..b8f68b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@ ChangeLog
  * cacher
    * fixed #324: xcache.readonly_protection = Off cause SEGV under mass concurrent
    * fixed #323: refix locking impl for threaded env
+ * build
+   * win32: fix build with no indent.exe nor cat.exe
 
 3.0.3 2013-06-18
 ChangeLog
diff --git a/config.w32 b/config.w32
index 54d7a0d..dd983f2 100644
--- a/config.w32
+++ b/config.w32
@@ -130,15 +130,15 @@ xc_cacher.c \
 	frag = frag.replace(/\$\(builddir\)/g,   builddir);
 	frag = frag.replace(/processor\//g,      "processor\\");
 	frag = frag.replace(/\.lo:/g, ".obj:");
-	frag = frag.replace(/.*\$\(CC\).* -E (.*) -o (.*)/, ccrule + " /E $1 > $2");
+	frag = frag.replace(/.*\$\(CC\).* -E (.*) -o (.*)/g, ccrule + " /E $1 > $2");
 	frag = frag.replace(/ -o /g, " /Fo");
 	frag = frag.replace(/cp /g, "copy ");
 	frag = frag.replace(/mv /g, "move ");
 	frag = frag.replace(/ \|\| /g, "\r\n\tif errorlevel 1 ");
 	frag = frag.replace(/ && /g, "\r\n\tif not errorlevel 1 ");
 	if (indent == '') {
-		frag = frag.replace(/\| +\$\(XCACHE_INDENT\)/, '');
-		frag = frag.replace(/\$\(XCACHE_INDENT\) < /, 'type ');
+		frag = frag.replace(/\| *\$\(XCACHE_INDENT\)/g, '');
+		frag = frag.replace(/\$\(XCACHE_INDENT\) *< */g, 'type ');
 	}
 	MFO.WriteLine(frag);
 	ADD_FLAG("CFLAGS_XCACHE", "/I " + builddir);