summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunfeng <junfeng.dong@intel.com>2013-03-19 11:08:21 +0800
committerlifang <fangx.li@intel.com>2013-03-29 23:12:43 +0800
commit615c3d94eacc87cb6a174e95b670ff9f7eb22ac6 (patch)
treea733af4adafcf9314c40659368cc4d0f403e1259
parentf25554d574e5aeeaea4def58c009300e09e11ff9 (diff)
downloadbadge-615c3d94eacc87cb6a174e95b670ff9f7eb22ac6.tar.gz
badge-615c3d94eacc87cb6a174e95b670ff9f7eb22ac6.tar.bz2
badge-615c3d94eacc87cb6a174e95b670ff9f7eb22ac6.zip
Change-Id: I746ae76cbf6c11dd392a5ea33338cd32224a9854
-rw-r--r--CMakeLists.txt2
-rwxr-xr-xpackaging/badge.spec2
2 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 002db9a..3ae54f2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ PROJECT(badge C)
SET(PREFIX ${CMAKE_INSTALL_PREFIX})
SET(EXEC_PREFIX "\${prefix}")
SET(PROJECT_NAME "${PROJECT_NAME}")
-SET(LIBDIR "\${exec_prefix}/lib")
+SET(LIBDIR ${LIB_INSTALL_DIR})
SET(INCLUDEDIR "\${prefix}/include/${PROJECT_NAME}")
SET(DBDIR "/opt/dbspace")
SET(DBFILE ".${PROJECT_NAME}.db")
diff --git a/packaging/badge.spec b/packaging/badge.spec
index d8c9075..9aa4b0d 100755
--- a/packaging/badge.spec
+++ b/packaging/badge.spec
@@ -28,7 +28,7 @@ Requires: %{name} = %{version}-%{release}
Badge library (devel).
%build
-export LDFLAGS+="-Wl,--rpath=%{_prefix}/lib -Wl,--as-needed"
+export LDFLAGS+="-Wl,--rpath=%{_libdir} -Wl,--as-needed"
LDFLAGS="$LDFLAGS" %cmake .
make %{?jobs:-j%jobs}