now conf files have right value

ldc-developers · Oct 12, 2011 · 52c6347 · 52c6347
1 parent 350d4a0
commit 52c6347
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -284,7 +284,7 @@ get_target_property(LDC_LOC ${LDC_EXE} LOCATION)
 FILE(GLOB library   "${PROJECT_SOURCE_DIR}/lib/*.a" "${PROJECT_SOURCE_DIR}/lib/*.so" "${PROJECT_SOURCE_DIR}/lib/*.dll")
 install(TARGETS     ${LDC_EXE}                                          DESTINATION bin)
 install(PROGRAMS    ${PROJECT_SOURCE_DIR}/bin/${LDMD_EXE}               DESTINATION bin)
-install(FILES       ${PROJECT_SOURCE_DIR}/bin/${LDC_EXE}.conf           DESTINATION ${CONF_INST_DIR})
+install(FILES       ${PROJECT_SOURCE_DIR}/bin/${LDC_EXE}_install.conf   DESTINATION ${CONF_INST_DIR}/${LDC_EXE}conf)
 install(FILES       ${PROJECT_SOURCE_DIR}/bin/${LDC_EXE}.rebuild.conf   DESTINATION ${CONF_INST_DIR})
 install(FILES       ${library}                                          DESTINATION ${CMAKE_INSTALL_LIBDIR})
 

diff --git a/ldc2.rebuild.conf.in b/ldc2.rebuild.conf.in
@@ -1,2 +1,2 @@
 [Environment]
-DFLAGS=-I@RUNTIME_DIR@/import -L-L%@P%/../lib -defaultlib=@RUNTIME_AIO@ -debuglib=@RUNTIME_AIO@
+DFLAGS=-I@INCLUDE_INSTALL_DIR@  -L-L@CMAKE_INSTALL_LIBDIR@ -defaultlib=@RUNTIME_AIO@ -debuglib=@RUNTIME_AIO@