do not exclude binaries, delete them submit/tizen/20130517.183738
authorAnas Nashif <anas.nashif@intel.com>
Fri, 17 May 2013 18:36:57 +0000 (14:36 -0400)
committerAnas Nashif <anas.nashif@intel.com>
Fri, 17 May 2013 18:36:57 +0000 (14:36 -0400)
- fixed install on 64 bit systems

CMakeLists.txt
packaging/pkgmgr.spec

index d7f090b..6607e4b 100755 (executable)
@@ -13,7 +13,7 @@ SET(VERSION_MAJOR 0)
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
-SET(LIBDIR "\${prefix}/lib")
+SET(LIBDIR ${LIB_INSTALL_DIR})
 SET(INCLUDEDIR "\${prefix}/include")
 
 
@@ -88,10 +88,10 @@ configure_file(org.tizen.slp.pkgmgr.service.in org.tizen.slp.pkgmgr.service @ONL
 configure_file(pkg_path.conf.in pkg_path.conf @ONLY)
 configure_file(pkgmgr.patch.sh.in pkgmgr.patch.sh @ONLY)
 
-#INSTALL(FILES ${CMAKE_BINARY_DIR}/libpkgmgr-client.so DESTINATION lib)
-INSTALL(TARGETS ${PKGMGR_CLIENT} DESTINATION lib COMPONENT RuntimeLibraries)
+#INSTALL(FILES ${CMAKE_BINARY_DIR}/libpkgmgr-client.so DESTINATION ${LIB_INSTALL_DIR})
+INSTALL(TARGETS ${PKGMGR_CLIENT} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
 INSTALL(FILES ${CMAKE_BINARY_DIR}/pkgmgr-server DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgmgr.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgmgr.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/client/include/package-manager.h DESTINATION include)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/client/include/pkgmgr-dbinfo.h DESTINATION include)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.tizen.slp.pkgmgr.service DESTINATION ${PREFIX}/share/dbus-1/services/)
index 68099c9..509245b 100755 (executable)
@@ -88,7 +88,7 @@ Package Manager client types develpoment package for packaging
 %setup -q
 
 %build
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
+%cmake . 
 make %{?jobs:-j%jobs}
 
 %install
@@ -139,7 +139,6 @@ mkdir -p /usr/etc/package-manager/server
 %{_datadir}/packages/org.tizen.pkgmgr-install.xml
 %{_datadir}/mime/packages/mime.wac.xml
 %{_datadir}/mime/packages/mime.tpk.xml
-%{_libdir}/libpkgmgr_parser_lib_sample.so
 %exclude %{_includedir}/pkgmgr/comm_client.h
 %exclude %{_includedir}/pkgmgr/comm_config.h
 %exclude %{_includedir}/pkgmgr/comm_status_broadcast_server.h