diff options
author | Xavier Roche <xavrock.os@gmail.com> | 2013-05-29 17:09:04 +0200 |
---|---|---|
committer | Xavier Roche <xavrock.os@gmail.com> | 2013-05-29 17:09:04 +0200 |
commit | 7632f8ead06ced5077b73406a4cb1f83906ee412 (patch) | |
tree | 39ef744b1fe8174c4f7d6ea3bafd5f6384125418 | |
parent | 7146d3670f1f75e83ed34a009267a3c1075e6c92 (diff) | |
download | libcryptsvc-7632f8ead06ced5077b73406a4cb1f83906ee412.tar.gz libcryptsvc-7632f8ead06ced5077b73406a4cb1f83906ee412.tar.bz2 libcryptsvc-7632f8ead06ced5077b73406a4cb1f83906ee412.zip |
Fix hardcoded library path for 64b compatibility
- Fix hardcoded lib path
- Use %cmake macro to set default path
-rwxr-xr-x | CMakeLists.txt | 7 | ||||
-rwxr-xr-x | cryptsvc.pc.in | 2 | ||||
-rwxr-xr-x | packaging/libcryptsvc.spec | 6 |
3 files changed, 7 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e7b0e4..e2a98f3 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,6 @@ PROJECT(cryptsvc C) SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(EXEC_PREFIX "\${prefix}") -SET(LIBDIR "\${prefix}/lib") SET(INCLUDEDIR "\${prefix}/include") INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include) @@ -115,9 +114,9 @@ SET(PC_LDFLAGS " -l${PROJECT_NAME} -l${LIBTZ_SO} ") SET(PC_REQUIRED ${pc_requires}) CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY) -INSTALL(FILES ${PROJECT_NAME}.pc DESTINATION lib/pkgconfig) -INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib) -INSTALL(TARGETS ${LIBTZ_SO} DESTINATION lib) +INSTALL(FILES ${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) +INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}) +INSTALL(TARGETS ${LIBTZ_SO} DESTINATION ${LIB_INSTALL_DIR}) INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION ${INCLUDEDIR}) ADD_DEFINITIONS(-D_bool_cryptsvc) diff --git a/cryptsvc.pc.in b/cryptsvc.pc.in index 2cd5754..81356ed 100755 --- a/cryptsvc.pc.in +++ b/cryptsvc.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/libcryptsvc.spec b/packaging/libcryptsvc.spec index b7603d3..4097ece 100755 --- a/packaging/libcryptsvc.spec +++ b/packaging/libcryptsvc.spec @@ -24,10 +24,10 @@ Requires: %{name} = %{version}-%{release} %build MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` -%ifarch %{ix86} -cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCH=x86 -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DDESCRIPTION=%{summary} +%ifarch %ix86 x86_64 +%cmake . -DARCH=x86 -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DDESCRIPTION=%{summary} %else -cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCH=arm -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DDESCRIPTION=%{summary} +%cmake . -DARCH=arm -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DDESCRIPTION=%{summary} %endif make %{?jobs:-j%jobs} |