diff options
| author | Junfeng Dong <junfeng.dong@intel.com> | 2013-01-31 21:06:25 +0800 |
|---|---|---|
| committer | Junfeng Dong <junfeng.dong@intel.com> | 2013-04-08 11:23:26 +0800 |
| commit | e13a7df9e6b93c9359681c534312e1160e9cf60e (patch) | |
| tree | c6db5d9e0fa75ce2066039ac77cf5319b210892c | |
| parent | f169dd333dc6f5bf6bfc12d04201ff798b7372e2 (diff) | |
| download | efl-util-tizen_2.2.tar.gz efl-util-tizen_2.2.tar.bz2 efl-util-tizen_2.2.zip | |
Fixed build on x86_64.submit/tizen_2.2/20130714.144226submit/tizen_2.2/20130714.135529submit/tizen_2.1/20130424.230322accepted/tizen_2.1/20130425.0406552.2_release2.2.1_release2.1b_releasetizen_2.2tizen_2.1
Change-Id: I285126bb925997dd5f609deedb6e5fe22f54743c
| -rwxr-xr-x | CMakeLists.txt | 6 | ||||
| -rwxr-xr-x | capi-ui-efl-util.pc.in | 2 | ||||
| -rw-r--r-- | packaging/capi-ui-efl-util.spec | 10 |
3 files changed, 6 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a1cdd13..a624985 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,7 @@ ENDIF("${ARCH}" STREQUAL "arm") ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"") ADD_DEFINITIONS("-DSLP_DEBUG") -SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib") +SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=${LIB_INSTALL_DIR}") aux_source_directory(src SOURCES) ADD_LIBRARY(${fw_name} SHARED ${SOURCES}) @@ -42,7 +42,7 @@ SET_TARGET_PROPERTIES(${fw_name} CLEAN_DIRECT_OUTPUT 1 ) -INSTALL(TARGETS ${fw_name} DESTINATION lib) +INSTALL(TARGETS ${fw_name} DESTINATION ${LIB_INSTALL_DIR}) INSTALL( DIRECTORY ${INC_DIR}/ DESTINATION include/ui FILES_MATCHING @@ -60,7 +60,7 @@ CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc @ONLY ) -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION lib/pkgconfig) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) IF(UNIX) diff --git a/capi-ui-efl-util.pc.in b/capi-ui-efl-util.pc.in index 3938d56..b9737af 100755 --- a/capi-ui-efl-util.pc.in +++ b/capi-ui-efl-util.pc.in @@ -3,7 +3,7 @@ prefix=@PREFIX@ exec_prefix=/usr -libdir=/usr/lib +libdir=@LIB_INSTALL_DIR@ includedir=/usr/include/ui Name: @PC_NAME@ diff --git a/packaging/capi-ui-efl-util.spec b/packaging/capi-ui-efl-util.spec index be8a866..210b416 100644 --- a/packaging/capi-ui-efl-util.spec +++ b/packaging/capi-ui-efl-util.spec @@ -1,7 +1,6 @@ -#sbs-git:slp/api/efl-util capi-ui-efl-util 0.1.0 4d35c6180088e0d005081bf798ab6a20b05e9f14 Name: capi-ui-efl-util Summary: An EFL utility library in SLP C API -Version: 0.1.0 +Version: 0.1.0 Release: 1 Group: TO_BE/FILLED_IN License: TO BE FILLED IN @@ -12,8 +11,6 @@ BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(utilX) BuildRequires: pkgconfig(elementary) BuildRequires: pkgconfig(capi-base-common) -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig %description @@ -31,13 +28,10 @@ Requires: %{name} = %{version}-%{release} %build MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` -cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER} - - +%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER} make %{?jobs:-j%jobs} %install -rm -rf %{buildroot} %make_install # for license notification |