From 7a9eb48cd8d9a1105d3c70a8ced2b0851dedfb4b Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Wed, 16 Jul 2014 19:43:23 +0000
Subject: [PATCH] [USETUP] Create additional install directories. Patch by Lee
 Schroeder. Thanks a lot!

CORE-7987 #resolve #comment Fixed in r63716.

svn path=/trunk/; revision=63716
---
 reactos/boot/bootdata/packages/reactos.dff.in | 22 ++++++++++
 reactos/cmake/CMakeMacros.cmake               | 44 +++++++++++++++++++
 2 files changed, 66 insertions(+)

diff --git a/reactos/boot/bootdata/packages/reactos.dff.in b/reactos/boot/bootdata/packages/reactos.dff.in
index 78e13f332b8..a92440080f7 100644
--- a/reactos/boot/bootdata/packages/reactos.dff.in
+++ b/reactos/boot/bootdata/packages/reactos.dff.in
@@ -32,6 +32,28 @@ Signature = "$ReactOS$"
 16 = Resources\Themes
 17 = system32\wbem
 18 = Resources\Themes\Lautus
+19 = Help
+20 = Config
+21 = Cursors
+22 = system32\ShellExt
+23 = Temp
+24 = system32\spool
+25 = system32\spool\drivers
+26 = system32\spool\drivers\color
+27 = system32\spool\drivers\w32x86
+28 = system32\spool\drivers\w32x86\3
+29 = system32\spool\prtprocs
+30 = system32\spool\prtprocs\w32x86
+31 = system32\wbem\Repository
+32 = system32\wbem\Repository\FS
+33 = system32\wbem\mof\good
+34 = system32\wbem\mof\bad
+35 = system32\wbem\AdStatus
+36 = system32\wbem\xml
+37 = system32\wbem\Logs
+38 = system32\wbem\AutoRecover
+39 = twain_32
+40 = repair
 
 .InfEnd
 
diff --git a/reactos/cmake/CMakeMacros.cmake b/reactos/cmake/CMakeMacros.cmake
index 8fa75941c83..0f34c2212ed 100644
--- a/reactos/cmake/CMakeMacros.cmake
+++ b/reactos/cmake/CMakeMacros.cmake
@@ -191,6 +191,50 @@ macro(dir_to_num dir var)
         set(${var} 17)
     elseif(${dir} STREQUAL reactos/Resources/Themes/Lautus)
         set(${var} 18)
+    elseif(${dir} STREQUAL reactos/Help)
+        set(${var} 19)
+    elseif(${dir} STREQUAL reactos/Config)
+        set(${var} 20)
+    elseif(${dir} STREQUAL reactos/Cursors)
+        set(${var} 21)
+    elseif(${dir} STREQUAL reactos/system32/ShellExt)
+        set(${var} 22)
+    elseif(${dir} STREQUAL reactos/Temp)
+        set(${var} 23)
+    elseif(${dir} STREQUAL reactos/system32/spool)
+        set(${var} 24)
+    elseif(${dir} STREQUAL reactos/system32/spool/drivers)
+        set(${var} 25)
+    elseif(${dir} STREQUAL reactos/system32/spool/drivers/color)
+        set(${var} 26)
+    elseif(${dir} STREQUAL reactos/system32/spool/drivers/w32x86)
+        set(${var} 27)
+    elseif(${dir} STREQUAL reactos/system32/spool/drivers/w32x86/3)
+        set(${var} 28)
+    elseif(${dir} STREQUAL reactos/system32/spool/prtprocs)
+        set(${var} 29)
+    elseif(${dir} STREQUAL reactos/system32/spool/prtprocs/w32x86)
+        set(${var} 30)
+    elseif(${dir} STREQUAL reactos/system32/wbem/Repository)
+        set(${var} 31)
+    elseif(${dir} STREQUAL reactos/system32/wbem/Repository/FS)
+        set(${var} 32)
+    elseif(${dir} STREQUAL reactos/system32/wbem/mof/good)
+        set(${var} 33)
+    elseif(${dir} STREQUAL reactos/system32/wbem/mof/bad)
+        set(${var} 34)
+    elseif(${dir} STREQUAL reactos/system32/wbem/AdStatus)
+        set(${var} 35)
+    elseif(${dir} STREQUAL reactos/system32/wbem/xml)
+        set(${var} 36)
+    elseif(${dir} STREQUAL reactos/system32/wbem/Logs)
+        set(${var} 37)
+    elseif(${dir} STREQUAL reactos/system32/wbem/AutoRecover)
+        set(${var} 38)
+    elseif(${dir} STREQUAL reactos/twain_32)
+        set(${var} 39)
+    elseif(${dir} STREQUAL reactos/repair)
+        set(${var} 40)
     else()
         message(FATAL_ERROR "Wrong destination: ${dir}")
     endif()