From 52c6347ef7e548952ac5e22115e0b9ea05f11a0d Mon Sep 17 00:00:00 2001 From: Jonathan MERCIER Date: Wed, 12 Oct 2011 03:27:23 +0200 Subject: [PATCH] now conf files have right value --- CMakeLists.txt | 2 +- ldc2.rebuild.conf.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 71b595b0..f5a91148 100644 --- 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 index dc91fbe3..5dc1bb12 100644 --- 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@