From 0085c9409c342f5f97b2fc4515c2657845dc4286 Mon Sep 17 00:00:00 2001
From: elrood <devnull@localhost>
Date: Fri, 5 Dec 2008 22:01:50 +0100
Subject: [PATCH] .. and fixed the install target (hopefully)

---
 CMakeLists.txt         | 8 ++++----
 runtime/CMakeLists.txt | 4 +---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5ae99f07..fdcec51c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -139,7 +139,7 @@ add_definitions(
 
 if(UNIX)
 	add_definitions(-DPOSIX)
-	set(CONF_INST_DIR etc)
+	set(CONF_INST_DIR bin)
 endif(UNIX)
 
 if(USE_BOEHM_GC)
@@ -185,7 +185,7 @@ get_target_property(LDC_LOC ${LDC_EXE} LOCATION)
 # TODO: testrun
 
 install(TARGETS ${LDC_EXE} DESTINATION bin)
+install(FILES ${PROJECT_BINARY_DIR}/bin/${LDC_EXE}.conf DESTINATION ${CONF_INST_DIR})
+install(DIRECTORY ${PROJECT_BINARY_DIR}/lib DESTINATION . USE_SOURCE_PERMISSIONS)
 
-install(FILES ${PROJECT_BINARY_DIR}/bin/${LDC_EXE_NAME}.conf DESTINATION ${CONF_INST_DIR})
-
-add_subdirectory(runtime)
+add_subdirectory(runtime EXCLUDE_FROM_ALL)
diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
index e485c629..5eaf7ad2 100644
--- a/runtime/CMakeLists.txt
+++ b/runtime/CMakeLists.txt
@@ -74,7 +74,7 @@ if(NOT LDC_LOC)
 	set(LDC_EXE_NAME ${LDC_EXE})
 endif(NOT LDC_LOC)
 
-configure_file(${PROJECT_PARENT_DIR}/${LDC_EXE}.conf.in ${PROJECT_BINARY_DIR}/../bin/${LDC_EXE_NAME}.conf)
+configure_file(${PROJECT_PARENT_DIR}/${LDC_EXE}.conf.in ${PROJECT_BINARY_DIR}/../bin/${LDC_EXE}.conf)
 
 # patch runtime source, uses LDC_EXE for ldc / ldc2
 find_program(PATCH_EXE patch DOC "path to patch tool")
@@ -177,5 +177,3 @@ set_target_properties(
 
 # BCLIBS is empty if BUILD_BC_LIBS is not selected
 add_custom_target(runtime DEPENDS ${LIBS} ${BCLIBS})
-
-install(DIRECTORY ${PROJECT_BINARY_DIR}/../lib DESTINATION .)
\ No newline at end of file