From 7ba04ad54c1c613ba0098d2af1cd2ca93957d08d Mon Sep 17 00:00:00 2001 From: Xavier Roche Date: Wed, 5 Jun 2013 10:58:18 +0200 Subject: [PATCH] Fix hardcoded library path for x64 build - Fix hardcoded lib path in CMakeLists and pc.in template file - Add lib PATH var in spec file --- CMakeLists.txt | 2 +- dukgenerator.pc.in | 2 +- packaging/dukgenerator.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 268cba4..af4f8f7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ PROJECT(dukgenerator C) SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(EXEC_PREFIX "\${prefix}") -SET(LIBDIR "\${prefix}/lib") +SET(LIBDIR ${LIB_INSTALL_DIR}) SET(INCLUDEDIR "\${prefix}/include") INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/inc) diff --git a/dukgenerator.pc.in b/dukgenerator.pc.in index 2cd5754..81356ed 100755 --- a/dukgenerator.pc.in +++ b/dukgenerator.pc.in @@ -1,7 +1,7 @@ # Package Information for pkg-config prefix=@PREFIX@ -libdir=@PREFIX@/lib +libdir=@LIB_INSTALL_DIR@ includedir=@PREFIX@/include Name: @PC_NAME@ diff --git a/packaging/dukgenerator.spec b/packaging/dukgenerator.spec index 1b7eecd..01de709 100644 --- a/packaging/dukgenerator.spec +++ b/packaging/dukgenerator.spec @@ -26,7 +26,7 @@ Device Unique Key Library (Development Files). %build MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` -%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DDESCRIPTION="%{summary}" -DBUILD_SHARED_LIBS:BOOL=OFF +%cmake . -DLIB_INSTALL_DIR:PATH=%{_libdir} -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DDESCRIPTION="%{summary}" -DBUILD_SHARED_LIBS:BOOL=OFF make %{?_smp_mflags} -- 2.7.4