From b559805b7ca1f7d4d12db720584736101edcab50 Mon Sep 17 00:00:00 2001
From: Alexey Prokhin <alexey.prokhin@yandex.ru>
Date: Fri, 2 Dec 2011 22:16:08 +0400
Subject: [PATCH] Fixed path to generated *.di files

---
 ldc2.rebuild.conf.in   | 2 +-
 ldc2_phobos.conf.in    | 2 +-
 runtime/CMakeLists.txt | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ldc2.rebuild.conf.in b/ldc2.rebuild.conf.in
index 4947fe77..c95b3269 100644
--- a/ldc2.rebuild.conf.in
+++ b/ldc2.rebuild.conf.in
@@ -1,2 +1,2 @@
 [Environment]
-DFLAGS=-I@INCLUDE_INSTALL_DIR@/phobos -I-I@INCLUDE_INSTALL_DIR@/ldc -I@INCLUDE_INSTALL_DIR@ -L-L@CMAKE_INSTALL_LIBDIR@ -defaultlib=@RUNTIME_AIO@ -debuglib=@RUNTIME_AIO@
+DFLAGS=-I-I@INCLUDE_INSTALL_DIR@/ldc -I@INCLUDE_INSTALL_DIR@ -L-L@CMAKE_INSTALL_LIBDIR@ -defaultlib=@RUNTIME_AIO@ -debuglib=@RUNTIME_AIO@
diff --git a/ldc2_phobos.conf.in b/ldc2_phobos.conf.in
index e08cd58c..0399e7e0 100644
--- a/ldc2_phobos.conf.in
+++ b/ldc2_phobos.conf.in
@@ -7,7 +7,7 @@ default:
     // 'switches' holds array of string that are appends to the command line
     // arguments before they are parsed.
     switches = [
-        "-I@PROJECT_BINARY_DIR@/../import",
+        "-I@CMAKE_BINARY_DIR@/import",
         "-I@RUNTIME_DIR@/import",
         "-I@RUNTIME_DIR@/src",
         "-I@PHOBOS2_DIR@/",
diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
index 4b77db37..2c4777d5 100644
--- a/runtime/CMakeLists.txt
+++ b/runtime/CMakeLists.txt
@@ -223,7 +223,7 @@ macro(dc INPUT_D OUTLIST_O OUTLIST_BC MOREFLAGS PATH SUFFIX)
     else (INDEX EQUAL -1)
         string(REGEX REPLACE "src/ldc" "src/core" output ${output})
         string(REGEX REPLACE "^src/" "" di_output ${output})
-        set(DI_CMD -Hf=${PROJECT_BINARY_DIR}/import/${di_output}.di)
+        set(DI_CMD -Hf=${CMAKE_BINARY_DIR}/import/${di_output}.di)
         list(REMOVE_AT GENERATE_DI ${INDEX})
     endif (INDEX EQUAL -1)
 
@@ -400,7 +400,7 @@ endif(MULTILIB)
 #
 
 if(D_VERSION EQUAL 2)
-    install(DIRECTORY     ${PROJECT_BINARY_DIR}/import/core                DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.di")
+    install(DIRECTORY     ${CMAKE_BINARY_DIR}/import/core                  DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.di")
     if(PHOBOS2_DIR)
         install(DIRECTORY ${PHOBOS2_DIR}/std                               DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.d")
         install(DIRECTORY ${PHOBOS2_DIR}/etc                               DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.d")