From 90ae4d68d90eb4a4a26472f80141a1ac1966bba5 Mon Sep 17 00:00:00 2001
From: Tomas Mlcoch <tmlcoch@redhat.com>
Date: Tue, 22 May 2012 09:52:02 +0200
Subject: [PATCH] Fix RPATH stuff in cmake

---
 CMakeLists.txt     | 12 ------------
 src/CMakeLists.txt |  4 ++--
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fdd9e54..8dcd2d9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -142,18 +142,6 @@ IF (NOT LIB_INSTALL_DIR)
 ENDIF (NOT LIB_INSTALL_DIR)
 
 
-# RPATH settings
-
-SET(CMAKE_SKIP_BUILD_RPATH  TRUE)
-SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-#SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-#SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-#LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
-#IF("${isSystemDir}" STREQUAL "-1")
-#   SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-#ENDIF("${isSystemDir}" STREQUAL "-1")
-
-
 # Add custom target for tests
 
 ADD_CUSTOM_TARGET(tests)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0fbf53b..8ec59dc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -21,5 +21,5 @@ ADD_EXECUTABLE(mergerepo_c mergerepo_c.c)
 TARGET_LINK_LIBRARIES(mergerepo_c libcreaterepo_c ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES})
 
 INSTALL(TARGETS libcreaterepo_c LIBRARY DESTINATION ${LIB_INSTALL_DIR})
-INSTALL(PROGRAMS createrepo_c DESTINATION usr/bin/)
-INSTALL(PROGRAMS mergerepo_c DESTINATION usr/bin/)
+INSTALL(TARGETS createrepo_c DESTINATION usr/bin/)
+INSTALL(TARGETS mergerepo_c DESTINATION usr/bin/)
-- 
2.7.4