diff options
| author | Anas Nashif <anas.nashif@intel.com> | 2013-02-05 06:44:02 -0800 |
|---|---|---|
| committer | Anas Nashif <anas.nashif@intel.com> | 2013-04-03 15:47:42 -0700 |
| commit | e1566748762ef146b25605c0d10165fbcce97d6e (patch) | |
| tree | 9b4125f7a6cd0029d65e504eb9eda1d4cff9a59c | |
| parent | 889400d2acf4bffb95c7cd6118974c8aa9e81525 (diff) | |
| download | libslp-db-util-e1566748762ef146b25605c0d10165fbcce97d6e.tar.gz libslp-db-util-e1566748762ef146b25605c0d10165fbcce97d6e.tar.bz2 libslp-db-util-e1566748762ef146b25605c0d10165fbcce97d6e.zip | |
Fixe build on x86_64 and cleanup specsubmit/tizen_2.1/20130424.230843submit/tizen/20130517.044814accepted/tizen_2.1/20130425.035440accepted/tizen/20130520.1009242.1b_releasetizen_2.1
Change-Id: I93a7e5f8e179759254a5a5cfa975feb3e84529d4
| -rwxr-xr-x | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | db-util.pc.in | 2 | ||||
| -rwxr-xr-x | packaging/libslp-db-util.spec | 9 |
3 files changed, 8 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 85b926e..eb292f3 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,6 @@ PROJECT(SLP-db-util) SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(EXEC_PREFIX "\${prefix}") -SET(LIBDIR "\${prefix}/lib") SET(INCLUDEDIR "\${prefix}/include/db-util") SET(VERSION_MAJOR 0) SET(VERSION "${VERSION_MAJOR}.1.0") @@ -41,8 +40,8 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${VERSION}) CONFIGURE_FILE(db-util.pc.in db-util.pc @ONLY) -INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib COMPONENT RuntimeLibraries) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/db-util.pc DESTINATION lib/pkgconfig) +INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/db-util.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/db-util.h DESTINATION include/db-util) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/db-util-common.h DESTINATION include/db-util) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/util-func.h DESTINATION include/db-util) diff --git a/db-util.pc.in b/db-util.pc.in index 44bff63..a1df72b 100644 --- a/db-util.pc.in +++ b/db-util.pc.in @@ -2,7 +2,7 @@ prefix=@PREFIX@ exec_prefix=@EXEC_PREFIX@ -libdir=@LIBDIR@ +libdir=@LIB_INSTALL_DIR@ includedir=@INCLUDEDIR@ Name: db-util diff --git a/packaging/libslp-db-util.spec b/packaging/libslp-db-util.spec index c1f4333..8943e4a 100755 --- a/packaging/libslp-db-util.spec +++ b/packaging/libslp-db-util.spec @@ -2,8 +2,8 @@ Name: libslp-db-util Summary: DB Utility Version: 0.1.1 Release: 5 -Group: System/Libraries -License: Apache License, Version 2.0 +Group: Application Framework/Database +License: Apache-2.0 Source0: %{name}-%{version}.tar.gz Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -14,19 +14,20 @@ BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(icu-i18n) %description +DB Utility. %package devel Summary: Devel package for libslp-db-util (devel) Group: Development/Libraries Requires: %{name} = %{version}-%{release} - %description devel +Devel package for libslp-db-util (devel) %prep %setup -q -n %{name}-%{version} %build -cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} +%cmake . make %{?jobs:-j%jobs} |