From e73afacf0f8a122da72373afd8961d0df7c6a8f7 Mon Sep 17 00:00:00 2001
From: Thomas Faber <thomas.faber@reactos.org>
Date: Mon, 20 May 2013 18:27:07 +0000
Subject: [PATCH] [CMAKE] - Produce a proper error when add_cd_file is used
 with an unknown folder - Remove an rbuild-leftover in reactos.dff.in - Update
 outdated build tool message in configure

svn path=/trunk/; revision=59058
---
 reactos/boot/bootdata/packages/reactos.dff.in | 2 --
 reactos/cmake/CMakeMacros.cmake               | 2 +-
 reactos/configure.cmd                         | 2 +-
 reactos/configure.sh                          | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/reactos/boot/bootdata/packages/reactos.dff.in b/reactos/boot/bootdata/packages/reactos.dff.in
index d054457c50c..fe25c3b36df 100644
--- a/reactos/boot/bootdata/packages/reactos.dff.in
+++ b/reactos/boot/bootdata/packages/reactos.dff.in
@@ -61,5 +61,3 @@ modules\optional\vmx_svga.inf                       6  optional
 modules\optional\vmx_svga.sys                       2  optional
 modules\optional\wine_gecko-1.9-x86.msi             4  optional
 boot\bootdata\bootcdregtest\AHKAppTests.cmd         7  optional
-
-modules\wallpaper\Angelus_02_ROSWP.bmp              4   optional
diff --git a/reactos/cmake/CMakeMacros.cmake b/reactos/cmake/CMakeMacros.cmake
index 73a5e1ae7f8..5d7c6e1a018 100644
--- a/reactos/cmake/CMakeMacros.cmake
+++ b/reactos/cmake/CMakeMacros.cmake
@@ -116,7 +116,7 @@ macro(dir_to_num dir var)
     elseif(${dir} STREQUAL reactos/Resources/Themes)
         set(${var} 16)
     else()
-        message(ERROR "Wrong destination: ${dir}")
+        message(FATAL_ERROR "Wrong destination: ${dir}")
     endif()
 endmacro()
 
diff --git a/reactos/configure.cmd b/reactos/configure.cmd
index b4b59087186..f1576ffdbdd 100755
--- a/reactos/configure.cmd
+++ b/reactos/configure.cmd
@@ -188,7 +188,7 @@ if "%BUILD_ENVIRONMENT%" == "MinGW" (
 
 cd..
 
-echo Configure script complete! Enter directories and execute appropriate build commands(ex: make, nmake, jom, etc...).
+echo Configure script complete! Enter directories and execute appropriate build commands(ex: ninja, make, nmake, etc...).
 exit /b
 
 :cmake_notfound
diff --git a/reactos/configure.sh b/reactos/configure.sh
index f5d289c0eb2..c394fa0be97 100755
--- a/reactos/configure.sh
+++ b/reactos/configure.sh
@@ -36,4 +36,4 @@ rm -f CMakeCache.txt
 
 cmake -G "$CMAKE_GENERATOR" -DENABLE_CCACHE=0 -DPCH=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=$ARCH -DREACTOS_BUILD_TOOLS_DIR="$REACTOS_BUILD_TOOLS_DIR" "$REACTOS_SOURCE_DIR"
 
-echo Configure script complete! Enter directories and execute appropriate build commands\(ex: make, makex, etc...\).
+echo Configure script complete! Enter directories and execute appropriate build commands\(ex: ninja, make, makex, etc...\).