diff options
| author | Xavier Roche <xavrock.os@gmail.com> | 2013-06-07 16:59:49 +0200 |
|---|---|---|
| committer | Xavier Roche <xavrock.os@gmail.com> | 2013-06-07 16:59:49 +0200 |
| commit | 4e50742109c834222a86cd0687c8bc444a5723db (patch) | |
| tree | c0c442f25a0cb4eb2c0287bfc38360bebf58cdeb | |
| parent | dccc7933d79253338fe4ce386f2207967570faf5 (diff) | |
| download | drm-service-core-intel-4e50742109c834222a86cd0687c8bc444a5723db.tar.gz drm-service-core-intel-4e50742109c834222a86cd0687c8bc444a5723db.tar.bz2 drm-service-core-intel-4e50742109c834222a86cd0687c8bc444a5723db.zip | |
Fix hardcoded library path for x64 build
- Use %cmake macro to get default path
- fix harcoded lib path in *.pc.in and CMakeLists
| -rwxr-xr-x | CMakeLists.txt | 6 | ||||
| -rwxr-xr-x | drm-service-core-intel.pc.in | 2 | ||||
| -rw-r--r-- | packaging/drm-service-core-intel.spec | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 431b4b3..78bf7ff 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,17 +3,17 @@ SET (this_target drm-intel) CONFIGURE_FILE(drm-service-core-intel.pc.in ${CMAKE_SOURCE_DIR}/drm-service-core-intel.pc @ONLY) -INSTALL(FILES ${CMAKE_SOURCE_DIR}/drm-service-core-intel.pc DESTINATION lib/pkgconfig) +INSTALL(FILES ${CMAKE_SOURCE_DIR}/drm-service-core-intel.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/include/ DESTINATION include/${this_target} FILES_MATCHING PATTERN "*.h") IF("${ARCH}" MATCHES "arm") -INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/lib/arm/ DESTINATION lib FILES_MATCHING PATTERN "*" +INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/lib/arm/ DESTINATION ${LIB_INSTALL_DIR} FILES_MATCHING PATTERN "*" PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ) ELSE("${ARCH}" MATCHES "arm") -INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/lib/ix86/ DESTINATION lib FILES_MATCHING PATTERN "*" +INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/lib/ix86/ DESTINATION ${LIB_INSTALL_DIR} FILES_MATCHING PATTERN "*" PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ) diff --git a/drm-service-core-intel.pc.in b/drm-service-core-intel.pc.in index 2389f61..aa3561b 100755 --- a/drm-service-core-intel.pc.in +++ b/drm-service-core-intel.pc.in @@ -1,4 +1,4 @@ -libdir=/usr/lib +libdir=@LIB_INSTALL_DIR@ includedir=/usr/include/drm-intel Name: drm-service-core-intel diff --git a/packaging/drm-service-core-intel.spec b/packaging/drm-service-core-intel.spec index ca1b623..ecb9aa5 100644 --- a/packaging/drm-service-core-intel.spec +++ b/packaging/drm-service-core-intel.spec @@ -28,9 +28,9 @@ The plugin library for installing drm-service-core-intel.so and header files. %build %ifarch %{arm} -cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCH=arm +%cmake . -DARCH=arm %else -cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCH=ix86 +%cmake . -DARCH=ix86 %endif make #make %{?jobs:-j%jobs} |