From 49594687df26662fcde6f1259ac1a89bd00fbcfc Mon Sep 17 00:00:00 2001
From: Royce Mitchell III <royce3@ev1.net>
Date: Sat, 12 Mar 2005 04:55:41 +0000
Subject: [PATCH] more *nix compatibility fixes

svn path=/branches/xmlbuildsystem/; revision=13956
---
 reactos/tools/buildno/buildno.mak                    | 4 ++--
 reactos/tools/cdmake/cdmake.mak                      | 2 +-
 reactos/tools/nci/nci.mak                            | 2 +-
 reactos/tools/rbuild/backend/mingw/modulehandler.cpp | 4 ++--
 reactos/tools/rbuild/rbuild.mak                      | 2 +-
 reactos/tools/unicode/unicode.mak                    | 2 +-
 reactos/tools/wmc/wmc.mak                            | 2 +-
 reactos/tools/wpp/wpp.mak                            | 2 +-
 reactos/tools/wrc/wrc.mak                            | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/reactos/tools/buildno/buildno.mak b/reactos/tools/buildno/buildno.mak
index 7a5da94865c..7168f4887c9 100644
--- a/reactos/tools/buildno/buildno.mak
+++ b/reactos/tools/buildno/buildno.mak
@@ -1,7 +1,7 @@
-BUILDNO_BASE = tools$(SEP)buildno
+BUILDNO_BASE = .$(SEP)tools$(SEP)buildno
 
 BUILDNO_TARGET = \
-	$(EXEPREFIX)$(BUILDNO_BASE)$(SEP)buildno$(EXEPOSTFIX)
+	$(ROS_INTERMEDIATE)$(BUILDNO_BASE)$(SEP)buildno$(EXEPOSTFIX)
 
 BUILDNO_SOURCES = \
 	$(BUILDNO_BASE)$(SEP)buildno.cpp \
diff --git a/reactos/tools/cdmake/cdmake.mak b/reactos/tools/cdmake/cdmake.mak
index 1a38ba8a01d..4b405fc9ead 100644
--- a/reactos/tools/cdmake/cdmake.mak
+++ b/reactos/tools/cdmake/cdmake.mak
@@ -1,4 +1,4 @@
-CDMAKE_BASE = tools$(SEP)cdmake
+CDMAKE_BASE = .$(SEP)tools$(SEP)cdmake
 
 CDMAKE_TARGET = \
 	$(ROS_INTERMEDIATE)$(CDMAKE_BASE)$(SEP)cdmake$(EXEPOSTFIX)
diff --git a/reactos/tools/nci/nci.mak b/reactos/tools/nci/nci.mak
index 9b4d21f9308..1298e0b58ab 100644
--- a/reactos/tools/nci/nci.mak
+++ b/reactos/tools/nci/nci.mak
@@ -1,4 +1,4 @@
-NCI_BASE = tools$(SEP)nci
+NCI_BASE = .$(SEP)tools$(SEP)nci
 
 NCI_TARGET = \
 	$(ROS_INTERMEDIATE)$(NCI_BASE)$(SEP)nci$(EXEPOSTFIX)
diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
index a9d6f08176c..db978080a8c 100644
--- a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
+++ b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
@@ -809,7 +809,7 @@ MingwModuleHandler::GenerateWindresCommand ( const Module& module,
 	string resFilename = ReplaceExtension ( sourceFilename,
 	                                        ".res" );
 	fprintf ( fMakefile,
-	          "%s: %s\n",
+	          "%s: %s $(WRC_TARGET)\n",
 	          objectFilename.c_str (),
 	          sourceFilename.c_str () );
 	fprintf ( fMakefile, "\t$(ECHO_WRC)\n" );
@@ -820,7 +820,7 @@ MingwModuleHandler::GenerateWindresCommand ( const Module& module,
 	         rciFilename.c_str () );
 	fprintf ( fMakefile,
 	         "\t${wrc} ${%s} %s %s\n",
-           windresflagsMacro.c_str (),
+	         windresflagsMacro.c_str (),
 	         rciFilename.c_str (),
 	         resFilename.c_str () );
 	fprintf ( fMakefile,
diff --git a/reactos/tools/rbuild/rbuild.mak b/reactos/tools/rbuild/rbuild.mak
index 59d04251a65..d7534e590c6 100644
--- a/reactos/tools/rbuild/rbuild.mak
+++ b/reactos/tools/rbuild/rbuild.mak
@@ -1,4 +1,4 @@
-RBUILD_BASE = tools$(SEP)rbuild
+RBUILD_BASE = .$(SEP)tools$(SEP)rbuild
 
 RBUILD_TARGET = \
 	$(ROS_INTERMEDIATE)$(RBUILD_BASE)$(SEP)rbuild$(EXEPOSTFIX)
diff --git a/reactos/tools/unicode/unicode.mak b/reactos/tools/unicode/unicode.mak
index 401d973a41b..cf400d50144 100644
--- a/reactos/tools/unicode/unicode.mak
+++ b/reactos/tools/unicode/unicode.mak
@@ -1,4 +1,4 @@
-UNICODE_BASE = tools$(SEP)unicode
+UNICODE_BASE = .$(SEP)tools$(SEP)unicode
 
 UNICODE_TARGET = \
 	$(ROS_INTERMEDIATE)$(UNICODE_BASE)$(SEP)libunicode.a
diff --git a/reactos/tools/wmc/wmc.mak b/reactos/tools/wmc/wmc.mak
index 7e39f9aed2d..f142581eda8 100644
--- a/reactos/tools/wmc/wmc.mak
+++ b/reactos/tools/wmc/wmc.mak
@@ -1,4 +1,4 @@
-WMC_BASE = tools$(SEP)wmc
+WMC_BASE = .$(SEP)tools$(SEP)wmc
 
 WMC_TARGET = \
 	$(ROS_INTERMEDIATE)$(WMC_BASE)$(SEP)wmc$(EXEPOSTFIX)
diff --git a/reactos/tools/wpp/wpp.mak b/reactos/tools/wpp/wpp.mak
index 965d6f12f0b..70bd90bdd6e 100644
--- a/reactos/tools/wpp/wpp.mak
+++ b/reactos/tools/wpp/wpp.mak
@@ -1,4 +1,4 @@
-WPP_BASE = tools$(SEP)wpp
+WPP_BASE = .$(SEP)tools$(SEP)wpp
 
 WPP_TARGET = \
 	$(ROS_INTERMEDIATE)$(WPP_BASE)$(SEP)libwpp.a
diff --git a/reactos/tools/wrc/wrc.mak b/reactos/tools/wrc/wrc.mak
index a5a4d3548b4..ee7f0901a25 100644
--- a/reactos/tools/wrc/wrc.mak
+++ b/reactos/tools/wrc/wrc.mak
@@ -1,4 +1,4 @@
-WRC_BASE = tools$(SEP)wrc
+WRC_BASE = .$(SEP)tools$(SEP)wrc
 
 WRC_TARGET = \
 	$(ROS_INTERMEDIATE)$(WRC_BASE)$(SEP)wrc$(EXEPOSTFIX)
-- 
2.17.1