From 4d5664922a121914cddc705cfb8b0ba2daeb3b1c Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 18 Sep 2009 14:54:14 +0000
Subject: Now it is possible to have spaces in the root directory name of the
 source tree (when using mhmake version 1.4.0)

---
 makefile.after                       | 6 +++---
 makefile.before                      | 4 ++++
 xorg-server/hw/xwin/xlaunch/makefile | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/makefile.after b/makefile.after
index 5324decca..600343e3e 100644
--- a/makefile.after
+++ b/makefile.after
@@ -48,9 +48,9 @@ $(EXE) :  $(OBJS) $(INCLUDELIBFILES) $(RESOBJS) $(MANIFESTFILE)
 endif  # End WINAPP or TTYAPP stuff
 
 ifeq ($(DEBUG),1)
-COMMONCFLAGS += $(DEFINES:%=-D%) $(INCLUDES:%=-I"%") -Fo"$(relpath $@)" -Fd"$(PDB)" "$<"
+COMMONCFLAGS += $(DEFINES:%=-D%) $(INCLUDES:%=-I%) -Fo$(relpath $@) -Fd"$(PDB)" $<
 else
-COMMONCFLAGS += $(DEFINES:%=-D%) $(INCLUDES:%=-I"%") -Fo"$(relpath $@)" "$<"
+COMMONCFLAGS += $(DEFINES:%=-D%) $(INCLUDES:%=-I%) -Fo$(relpath $@) $<
 PDB=   # There is no PDB file generated in a release build
 endif
 
@@ -76,7 +76,7 @@ $(OBJDIR)\%$(OBJEXT) : %.cc
 	$(CC) $(CCFLAGS) /EHsc $(COMMONCFLAGS)
 
 $(OBJDIR)\%.res : %.rc
-	$(RC) $(RCFLAGS) $(RCDEFINES:%=-d "%") $(RCINCLUDES:%=-i "%") -Fo"$(relpath $@)" "$<"
+	$(RC) $(RCFLAGS) $(RCDEFINES:%=-d "%") $(RCINCLUDES:%=-i %) -Fo$(relpath $@) $<
 
 ifdef INC_BDF_RULES
 load_makefile $(MHMAKECONF)\bdftopcf\makefile MAKESERVER=0 DEBUG=$(DEBUG)
diff --git a/makefile.before b/makefile.before
index df6d084e2..851625e7e 100644
--- a/makefile.before
+++ b/makefile.before
@@ -1,3 +1,7 @@
+ifndef DEBUG
+DEBUG=0
+endif
+
 default: all
 .PHONY : default
 
diff --git a/xorg-server/hw/xwin/xlaunch/makefile b/xorg-server/hw/xwin/xlaunch/makefile
index 345357d92..63b37dd1b 100644
--- a/xorg-server/hw/xwin/xlaunch/makefile
+++ b/xorg-server/hw/xwin/xlaunch/makefile
@@ -18,7 +18,7 @@ WINAPP = xlaunch
 RESOURCES = resources.rc
 
 $(OBJDIR)\%.res : resources\%.rc
-	$(RC) $(RCFLAGS) $(RCDEFINES:%=-d "%") $(RCINCLUDES:%=-i "%") -Fo"$(relpath $@)" "$<"
+	$(RC) $(RCFLAGS) $(RCDEFINES:%=-d "%") $(RCINCLUDES:%=-i %) -Fo$(relpath $@) $<
 
 LIBDIRS=$(dir $(INCLUDELIBFILES))
 
-- 
cgit v1.2.3