From e6969929db01fca31c66793dfea32ab46f777a48 Mon Sep 17 00:00:00 2001
From: Graydon Hoare <graydon@mozilla.com>
Date: Wed, 23 Mar 2011 14:35:28 -0700
Subject: [PATCH] More miserable win32 configury fixes. Getting closer.

---
 Makefile.in | 19 ++++++++++++++-----
 configure   |  5 +++++
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 1f2284d18c3..619862e6e56 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -76,8 +76,8 @@ ifdef CFG_WINDOWSY
   CFG_RUN_TEST=PATH="$(CFG_LDPATH)" $(1)
   CFG_RUN_TARG=PATH="$(CFG_LDPATH)" $(1)
 
-  CFG_PATH_MUNGE := $(strip perl -i -p                 \
-                           -e 's@\\(.)@/\1@go;'        \
+  CFG_PATH_MUNGE := $(strip perl -i.bak -p             \
+                           -e 's@\\(\S)@/\1@go;'       \
                            -e 's@^/([a-zA-Z])/@\1:/@o;')
   ifdef CFG_FLEXLINK
     CFG_BOOT_NATIVE := 1
@@ -987,6 +987,7 @@ rt/%.d: rt/%.cpp $(MKFILES)
       $(subst $(S)src/,,$(patsubst %.cpp, %.o, $<)), \
       $(RUNTIME_INCS)) $< >$@.tmp
 	$(Q)$(CFG_PATH_MUNGE) $@.tmp
+	$(Q)rm -f $@.tmp.bak
 	$(Q)mv $@.tmp $@
 
 rustllvm/%.d: rustllvm/%.cpp $(MKFILES)
@@ -995,20 +996,25 @@ rustllvm/%.d: rustllvm/%.cpp $(MKFILES)
       $(subst $(S)src/,,$(patsubst %.cpp, %.o, $<)), \
       $(CFG_LLVM_CXXFLAGS) $(RUSTLLVM_INCS)) $< >$@.tmp
 	$(Q)$(CFG_PATH_MUNGE) $@.tmp
+	$(Q)rm -f $@.tmp.bak
 	$(Q)mv $@.tmp $@
 
 %.d: %.ml $(MKFILES)
 	@$(call E, dep: $@)
 	$(Q)ocamldep$(OPT) -slash $(BOOT_ML_DEP_INCS) $< >$@.tmp
 	$(Q)$(CFG_PATH_MUNGE) $@.tmp
-	$(Q)perl -i -pe "s@$(S)src/@@go" $@.tmp
+	$(Q)rm -f $@.tmp.bak
+	$(Q)perl -i.bak -pe "s@$(S)src/@@go" $@.tmp
+	$(Q)rm -f $@.tmp.bak
 	$(Q)mv $@.tmp $@
 
 %.d: %.mli $(MKFILES)
 	@$(call E, dep: $@)
 	$(Q)ocamldep$(OPT) -slash $(BOOT_ML_DEP_INCS) $< >$@.tmp
 	$(Q)$(CFG_PATH_MUNGE) $@.tmp
-	$(Q)perl -i -pe "s@$(S)src/@@go" $@.tmp
+	$(Q)rm -f $@.tmp.bak
+	$(Q)perl -i.bak -pe "s@$(S)src/@@go" $@.tmp
+	$(Q)rm -f $@.tmp.bak
 	$(Q)mv $@.tmp $@
 
 ifneq ($(MAKECMDGOALS),clean)
@@ -1029,6 +1035,7 @@ boot/$(CFG_STDLIB).d: $(STDLIB_CRATE) $(STDLIB_INPUTS) \
 	@$(call E, dep: $@)
 	$(BOOT) -o $(patsubst %.d,%,$@) -shared -rdeps $< >$@.tmp
 	$(Q)$(CFG_PATH_MUNGE) $@.tmp
+	$(Q)rm -f $@.tmp.bak
 	$(Q)mv $@.tmp $@
 
 stage0/rustc$(X).d: $(COMPILER_CRATE) $(COMPILER_INPUTS) \
@@ -1036,12 +1043,14 @@ stage0/rustc$(X).d: $(COMPILER_CRATE) $(COMPILER_INPUTS) \
 	@$(call E, dep: $@)
 	$(BOOT) -o $(patsubst %.d,%,$@) -shared -rdeps $< >$@.tmp
 	$(Q)$(CFG_PATH_MUNGE) $@.tmp
+	$(Q)rm -f $@.tmp.bak
 	$(Q)mv $@.tmp $@
 
 %.d: %.rc $(MKFILES) boot/rustboot$(X)
 	@$(call E, dep: $@)
 	$(BOOT)  -o $(patsubst %.d,%,$@) -rdeps $< >$@.tmp
 	$(Q)$(CFG_PATH_MUNGE) $@.tmp
+	$(Q)rm -f $@.tmp.bak
 	$(Q)mv $@.tmp $@
 
 ifneq ($(MAKECMDGOALS),clean)
@@ -1149,5 +1158,5 @@ clean:
                              bc o s exe dSYM,                          \
                         $(wildcard test/*/*.$(ext) test/bench/*/*.$(ext)))
 	$(Q)rm -Rf $(foreach ext, \
-                 aux cp fn ky log pdf html pg toc tp vr cps texi \
+                 aux cp fn ky log pdf html pg toc tp vr cps texi, \
                  $(wildcard doc/*.$(ext)))
diff --git a/configure b/configure
index f75e3d3255c..cda5b334342 100755
--- a/configure
+++ b/configure
@@ -179,6 +179,11 @@ putvar CFG_LLVM_CXXFLAGS
 putvar CFG_LLVM_LDFLAGS
 putvar CFG_LLVM_LIBS
 
+# Munge any paths that appear in config.mk back to posix-y
+perl -i.bak -p -e 's@ ([a-zA-Z]):\\@ /\1/@go;' \
+               -e 's@\\@/@go;' config.mk
+rm -f config.mk.bak
+
 copy ${CFG_SRC_DIR}Makefile.in ./Makefile
 
 echo "configure: complete"