From 46b765a5fa875d991d5e86b67132850840e356c7 Mon Sep 17 00:00:00 2001 From: Samuel Serapion Date: Sat, 26 Dec 2009 06:23:47 +0000 Subject: [PATCH] [rbuild] Really fix mkhive command. svn path=/branches/ros-amd64-bringup/; revision=44763 --- reactos/tools/rbuild/backend/mingw/mingw.cpp | 4 ++-- reactos/tools/rbuild/backend/mingw/modulehandler.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/reactos/tools/rbuild/backend/mingw/mingw.cpp b/reactos/tools/rbuild/backend/mingw/mingw.cpp index 55dbe04fb70..c50f326a8d2 100644 --- a/reactos/tools/rbuild/backend/mingw/mingw.cpp +++ b/reactos/tools/rbuild/backend/mingw/mingw.cpp @@ -1297,14 +1297,14 @@ MingwBackend::OutputRegistryInstallTarget () "install_registry: %s\n", registryTargetFiles.c_str () ); fprintf ( fMakefile, - "%s: %s %s $(MKHIVE_TARGET)\n", + "%s: %s %s $(mkhive_TARGET)\n", registryTargetFiles.c_str (), registrySourceFiles.c_str (), GetFullPath ( system32 ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_MKHIVE)\n" ); fprintf ( fMakefile, - "\t$(MKHIVE_TARGET) boot%cbootdata %s boot%cbootdata%chiveinst_$(ARCH).inf\n", + "\t$(mkhive_TARGET) boot%cbootdata %s boot%cbootdata%chiveinst_$(ARCH).inf\n", cSep, GetFullPath ( system32 ).c_str (), cSep, cSep ); fprintf ( fMakefile, diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp index 282112fda26..abc9c653441 100644 --- a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp +++ b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp @@ -2939,7 +2939,7 @@ MingwLiveIsoModuleHandler::OutputRegistryCommands ( string& livecdDirectory ) fprintf ( fMakefile, "\t$(ECHO_MKHIVE)\n" ); fprintf ( fMakefile, - "\t$(mkhive_TARGET) boot%cbootdata %s $(ARCH) boot%cbootdata%clivecd.inf boot%cbootdata%chiveinst_$(ARCH).inf\n", + "\t$(mkhive_TARGET) boot%cbootdata %s boot%cbootdata%clivecd.inf boot%cbootdata%chiveinst_$(ARCH).inf\n", cSep, backend->GetFullPath ( reactosSystem32ConfigDirectory ).c_str (), cSep, cSep, cSep, cSep ); }