Fix x86_64 build-install compliance

 - Fix hard-coded library path : CMakeLists.txt, *.pc.in
 - Use %cmake macro to set default path
 - Change path for --rpath in LDFLAGS
 - Fix unsigned int in source file
 - convert unsigned int to unsigned long

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 38b193c..e8bc12d 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -121,7 +121,7 @@ INSTALL(FILES ${COMMON_CONFIG_DTD} DESTINATION ${COMMON_CONFIG_DTD_DST})
 # Global variables
 # -----------------------------------------------------------------------------
 
-SET(DESTINATION_LIB_PREFIX lib/wrt-plugins)
+SET(DESTINATION_LIB_PREFIX ${LIB_INSTALL_DIR}/wrt-plugins)
 
 SET(DESTINATION_HEADER_PREFIX include/${PROJECT_NAME})
 
@@ -149,7 +149,7 @@ SET(PKGCONFIG_DIR ${CMAKE_SOURCE_DIR}/pkgconfigs)
 MACRO(configure_and_install_pkg PKG_FILE)
     CONFIGURE_FILE(${PKGCONFIG_DIR}/${PKG_FILE}.in
                ${PKGCONFIG_DIR}/${PKG_FILE} @ONLY)
-    INSTALL(FILES ${PKGCONFIG_DIR}/${PKG_FILE} DESTINATION lib/pkgconfig)
+    INSTALL(FILES ${PKGCONFIG_DIR}/${PKG_FILE} DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 ENDMACRO(configure_and_install_pkg)
 
 # -----------------------------------------------------------------------------

diff --git a/packaging/wrt-plugins-tizen.spec b/packaging/wrt-plugins-tizen.spec
index d9810b6..4e81924 100755 (executable)
--- a/packaging/wrt-plugins-tizen.spec
+++ b/packaging/wrt-plugins-tizen.spec
@@ -89,7 +89,7 @@ Wrt-plugin-tizen development headers
 
 export LDFLAGS+="-Wl,--rpath=%{PREFIX} -Wl,--as-needed"
 
-cmake \
+%cmake \
 -DENABLE_OPTIONAL_BT=YES \
 -DENABLE_OPTIONAL_CALL_HISTORY=YES \
 -DENABLE_OPTIONAL_NBS=YES \

diff --git a/pkgconfigs/wrt-plugins-tizen-alarm.pc.in b/pkgconfigs/wrt-plugins-tizen-alarm.pc.in
index 7ba86aa..1226c20 100644 (file)
--- a/pkgconfigs/wrt-plugins-tizen-alarm.pc.in
+++ b/pkgconfigs/wrt-plugins-tizen-alarm.pc.in
@@ -2,7 +2,7 @@ prefix=/usr
 project_name=@CMAKE_PROJECT_NAME@
 module_name=alarm
 exec_prefix=${prefix}
-libdir=${prefix}/lib/wrt-plugins/tizen-${module_name}
+libdir=@LIB_INSTALL_DIR@/wrt-plugins/tizen-${module_name}
 includedir=${prefix}/include/${project_name}
 
 Name: wrt-plugins-tizen-${module_name}
@@ -10,4 +10,4 @@ Description: wrt-plugins-tizen-${module_name}
 Version: @CMAKE_PROJECT_VERSION@
 Requires: capi-appfw-application
 Libs: -L${libdir} -lwrt-plugins-tizen-${module_name}-impl
-Cflags: -I${includedir}/${module_name}
\ No newline at end of file
+Cflags: -I${includedir}/${module_name}

diff --git a/pkgconfigs/wrt-plugins-tizen-application.pc.in b/pkgconfigs/wrt-plugins-tizen-application.pc.in
index d90c038..60cc46f 100644 (file)
--- a/pkgconfigs/wrt-plugins-tizen-application.pc.in
+++ b/pkgconfigs/wrt-plugins-tizen-application.pc.in
@@ -2,7 +2,7 @@ prefix=/usr
 project_name=@CMAKE_PROJECT_NAME@
 module_name=application
 exec_prefix=${prefix}
-libdir=${prefix}/lib/wrt-plugins/tizen-${module_name}
+libdir=@LIB_INSTALL_DIR@/wrt-plugins/tizen-${module_name}
 includedir=${prefix}/include/${project_name}
 
 Name: wrt-plugins-tizen-${module_name}
@@ -10,4 +10,4 @@ Description: wrt-plugins-tizen-${module_name}
 Version: @CMAKE_PROJECT_VERSION@
 Requires: capi-appfw-app-manager capi-appfw-application capi-appfw-package-manager pkgmgr pkgmgr-info
 Libs: -L${libdir} -lwrt-plugins-tizen-${module_name}-impl -lwrt-plugins-tizen-${module_name}-config
-Cflags: -I${includedir}/${module_name}
\ No newline at end of file
+Cflags: -I${includedir}/${module_name}

diff --git a/pkgconfigs/wrt-plugins-tizen-bluetooth.pc.in b/pkgconfigs/wrt-plugins-tizen-bluetooth.pc.in
index 7b03f29..98b6d8c 100644 (file)
--- a/pkgconfigs/wrt-plugins-tizen-bluetooth.pc.in
+++ b/pkgconfigs/wrt-plugins-tizen-bluetooth.pc.in
@@ -2,7 +2,7 @@ prefix=/usr
 project_name=@CMAKE_PROJECT_NAME@
 module_name=bluetooth
 exec_prefix=${prefix}
-libdir=${prefix}/lib/wrt-plugins/tizen-${module_name}
+libdir=@LIB_INSTALL_DIR@/wrt-plugins/tizen-${module_name}
 includedir=${prefix}/include/${project_name}
 
 Name: wrt-plugins-tizen-${module_name}
@@ -10,4 +10,4 @@ Description: wrt-plugins-tizen-${module_name}
 Version: @CMAKE_PROJECT_VERSION@
 Requires: capi-network-bluetooth
 Libs: -L${libdir} -lwrt-plugins-tizen-${module_name}-impl
-Cflags: -I${includedir}/${module_name}
\ No newline at end of file
+Cflags: -I${includedir}/${module_name}

diff --git a/pkgconfigs/wrt-plugins-tizen-bookmark.pc.in b/pkgconfigs/wrt-plugins-tizen-bookmark.pc.in
index f8109d2..38a6e48 100644 (file)
--- a/pkgconfigs/wrt-plugins-tizen-bookmark.pc.in
+++ b/pkgconfigs/wrt-plugins-tizen-bookmark.pc.in
@@ -2,7 +2,7 @@ prefix=/usr
 project_name=@CMAKE_PROJECT_NAME@
 module_name=bookmark
 exec_prefix=${prefix}
-libdir=${prefix}/lib/wrt-plugins/tizen-${module_name}
+libdir=@LIB_INSTALL_DIR@/wrt-plugins/tizen-${module_name}
 includedir=${prefix}/include/${project_name}
 
 Name: wrt-plugins-tizen-${module_name}
@@ -10,4 +10,4 @@ Description: wrt-plugins-tizen-${module_name}
 Version: @CMAKE_PROJECT_VERSION@
 Requires: capi-web-favorites
 Libs: -L${libdir} -lwrt-plugins-tizen-${module_name}-impl
-Cflags: -I${includedir}/${module_name}
\ No newline at end of file
+Cflags: -I${includedir}/${module_name}

diff --git a/pkgconfigs/wrt-plugins-tizen-calendar.pc.in b/pkgconfigs/wrt-plugins-tizen-calendar.pc.in
index 0590345..de90a4a 100644 (file)
--- a/pkgconfigs/wrt-plugins-tizen-calendar.pc.in
+++ b/pkgconfigs/wrt-plugins-tizen-calendar.pc.in
@@ -2,7 +2,7 @@ prefix=/usr
 project_name=@CMAKE_PROJECT_NAME@
 module_name=calendar
 exec_prefix=${prefix}
-libdir=${prefix}/lib/wrt-plugins/tizen-${module_name}
+libdir=@LIB_INSTALL_DIR@/wrt-plugins/tizen-${module_name}
 includedir=${prefix}/include/${project_name}
 
 Name: wrt-plugins-tizen-${module_name}

diff --git a/pkgconfigs/wrt-plugins-tizen-callhistory.pc.in b/pkgconfigs/wrt-plugins-tizen-callhistory.pc.in
index 4c18371..f0d97ba 100755 (executable)
--- a/pkgconfigs/wrt-plugins-tizen-callhistory.pc.in
+++ b/pkgconfigs/wrt-plugins-tizen-callhistory.pc.in
@@ -2,7 +2,7 @@ prefix=/usr
 project_name=@CMAKE_PROJECT_NAME@
 module_name=callhistory
 exec_prefix=${prefix}
-libdir=${prefix}/lib/wrt-plugins/tizen-${module_name}
+libdir=@LIB_INSTALL_DIR@/wrt-plugins/tizen-${module_name}
 includedir=${prefix}/include/${project_name}
 
 Name: wrt-plugins-tizen-${module_name}
@@ -10,4 +10,4 @@ Description: wrt-plugins-tizen-${module_name}
 Version: @CMAKE_PROJECT_VERSION@
 Requires: contacts-service2 glib-2.0 libpcrecpp
 Libs: -L${libdir} -lwrt-plugins-tizen-${module_name}-impl
-Cflags: -I${includedir}/${module_name}
\ No newline at end of file
+Cflags: -I${includedir}/${module_name}

diff --git a/pkgconfigs/wrt-plugins-tizen-common.pc.in b/pkgconfigs/wrt-plugins-tizen-common.pc.in
index 7880649..62f4a79 100755 (executable)
--- a/pkgconfigs/wrt-plugins-tizen-common.pc.in
+++ b/pkgconfigs/wrt-plugins-tizen-common.pc.in
@@ -2,7 +2,7 @@ prefix=/usr
 project_name=@CMAKE_PROJECT_NAME@
 module_name=common
 exec_prefix=${prefix}
-libdir=${prefix}/lib/wrt-plugins/tizen-tizen
+libdir=@LIB_INSTALL_DIR@/wrt-plugins/tizen-tizen
 includedir=${prefix}/include/${project_name}
 
 Name: wrt-plugins-tizen-${module_name}
@@ -10,4 +10,4 @@ Description: wrt-plugins-tizen-${module_name}
 Version: @CMAKE_PROJECT_VERSION@
 Requires:
 Libs: -L${libdir} -lwrt-plugins-tizen-${module_name}
-Cflags: -I${includedir}/${module_name}
\ No newline at end of file
+Cflags: -I${includedir}/${module_name}

diff --git a/pkgconfigs/wrt-plugins-tizen-contact.pc.in b/pkgconfigs/wrt-plugins-tizen-contact.pc.in
index c54a2f3..6116b8c 100755 (executable)
--- a/pkgconfigs/wrt-plugins-tizen-contact.pc.in
+++ b/pkgconfigs/wrt-plugins-tizen-contact.pc.in
@@ -2,7 +2,7 @@ prefix=/usr
 project_name=@CMAKE_PROJECT_NAME@
 module_name=contact
 exec_prefix=${prefix}
-libdir=${prefix}/lib/wrt-plugins/tizen-${module_name}
+libdir=@LIB_INSTALL_DIR@/wrt-plugins/tizen-${module_name}
 includedir=${prefix}/include/${project_name}
 
 Name: wrt-plugins-tizen-${module_name}
@@ -10,4 +10,4 @@ Description: wrt-plugins-tizen-${module_name}
 Version: @CMAKE_PROJECT_VERSION@
 Requires: contacts-service2 libpcrecpp
 Libs: -L${libdir} -lwrt-plugins-tizen-${module_name}-impl -lwrt-plugins-tizen-${module_name}-config
-Cflags: -I${includedir}/${module_name}
\ No newline at end of file
+Cflags: -I${includedir}/${module_name}

diff --git a/pkgconfigs/wrt-plugins-tizen-content.pc.in b/pkgconfigs/wrt-plugins-tizen-content.pc.in
index 69c4601..09f8fb0 100644 (file)
--- a/pkgconfigs/wrt-plugins-tizen-content.pc.in
+++ b/pkgconfigs/wrt-plugins-tizen-content.pc.in
@@ -2,7 +2,7 @@ prefix=/usr
 project_name=@CMAKE_PROJECT_NAME@
 module_name=content
 exec_prefix=${prefix}
-libdir=${prefix}/lib/wrt-plugins/tizen-${module_name}
+libdir=@LIB_INSTALL_DIR@/wrt-plugins/tizen-${module_name}
 includedir=${prefix}/include/${project_name}
 
 Name: wrt-plugins-tizen-${module_name}
@@ -10,4 +10,4 @@ Description: wrt-plugins-tizen-${module_name}
 Version: @CMAKE_PROJECT_VERSION@
 Requires: capi-content-media-content  capi-media-metadata-extractor
 Libs: -L${libdir} -lwrt-plugins-tizen-${module_name}-impl
-Cflags: -I${includedir}/${module_name}
\ No newline at end of file
+Cflags: -I${includedir}/${module_name}

diff --git a/pkgconfigs/wrt-plugins-tizen-datacontrol.pc.in b/pkgconfigs/wrt-plugins-tizen-datacontrol.pc.in
index cb10aa0..4b3633b 100644 (file)
--- a/pkgconfigs/wrt-plugins-tizen-datacontrol.pc.in
+++ b/pkgconfigs/wrt-plugins-tizen-datacontrol.pc.in
@@ -2,7 +2,7 @@ prefix=/usr
 project_name=@CMAKE_PROJECT_NAME@
 module_name=datacontrol
 exec_prefix=${prefix}
-libdir=${prefix}/lib/wrt-plugins/tizen-${module_name}
+libdir=@LIB_INSTALL_DIR@/wrt-plugins/tizen-${module_name}
 includedir=${prefix}/include/${project_name}
 
 Name: wrt-plugins-tizen-${module_name}
@@ -10,4 +10,4 @@ Description: wrt-plugins-tizen-${module_name}
 Version: @CMAKE_PROJECT_VERSION@
 Requires: capi-appfw-application appsvc pkgmgr
 Libs: -L${libdir} -lwrt-plugins-tizen-${module_name}-impl
-Cflags: -I${includedir}/${module_name}
\ No newline at end of file
+Cflags: -I${includedir}/${module_name}

diff --git a/pkgconfigs/wrt-plugins-tizen-datasync.pc.in b/pkgconfigs/wrt-plugins-tizen-datasync.pc.in
index 49ca8bc..944c8d5 100644 (file)
--- a/pkgconfigs/wrt-plugins-tizen-datasync.pc.in
+++ b/pkgconfigs/wrt-plugins-tizen-datasync.pc.in
@@ -2,7 +2,7 @@ prefix=/usr
 project_name=@CMAKE_PROJECT_NAME@
 module_name=datasync
 exec_prefix=${prefix}
-libdir=${prefix}/lib/wrt-plugins/tizen-${module_name}
+libdir=@LIB_INSTALL_DIR@/wrt-plugins/tizen-${module_name}
 includedir=${prefix}/include/${project_name}
 
 Name: wrt-plugins-tizen-${module_name}

diff --git a/pkgconfigs/wrt-plugins-tizen-download.pc.in b/pkgconfigs/wrt-plugins-tizen-download.pc.in
index a703343..766c593 100644 (file)
--- a/pkgconfigs/wrt-plugins-tizen-download.pc.in
+++ b/pkgconfigs/wrt-plugins-tizen-download.pc.in
@@ -2,7 +2,7 @@ prefix=/usr
 project_name=@CMAKE_PROJECT_NAME@
 module_name=download
 exec_prefix=${prefix}
-libdir=${prefix}/lib/wrt-plugins/tizen-${module_name}
+libdir=@LIB_INSTALL_DIR@/wrt-plugins/tizen-${module_name}
 includedir=${prefix}/include/${project_name}
 
 Name: wrt-plugins-tizen-${module_name}
@@ -10,4 +10,4 @@ Description: wrt-plugins-tizen-${module_name}
 Version: @CMAKE_PROJECT_VERSION@
 Requires: capi-web-url-download
 Libs: -L${libdir} -lwrt-plugins-tizen-${module_name}-impl
-Cflags: -I${includedir}/${module_name}
\ No newline at end of file
+Cflags: -I${includedir}/${module_name}

diff --git a/pkgconfigs/wrt-plugins-tizen-filesystem.pc.in b/pkgconfigs/wrt-plugins-tizen-filesystem.pc.in
index 3deb9e4..68fbdbd 100755 (executable)
--- a/pkgconfigs/wrt-plugins-tizen-filesystem.pc.in
+++ b/pkgconfigs/wrt-plugins-tizen-filesystem.pc.in
@@ -2,7 +2,7 @@ prefix=/usr
 project_name=@CMAKE_PROJECT_NAME@
 module_name=filesystem
 exec_prefix=${prefix}
-libdir=${prefix}/lib/wrt-plugins/tizen-${module_name}
+libdir=@LIB_INSTALL_DIR@/wrt-plugins/tizen-${module_name}
 includedir=${prefix}/include/${project_name}
 
 Name: wrt-plugins-tizen-${module_name}
@@ -10,4 +10,4 @@ Description: wrt-plugins-tizen-${module_name}
 Version: @CMAKE_PROJECT_VERSION@
 Requires:
 Libs: -L${libdir} -lwrt-plugins-tizen-${module_name}-impl -lwrt-plugins-tizen-${module_name}-config
-Cflags: -I${includedir}/${module_name}
\ No newline at end of file
+Cflags: -I${includedir}/${module_name}

diff --git a/pkgconfigs/wrt-plugins-tizen-log.pc.in b/pkgconfigs/wrt-plugins-tizen-log.pc.in
index d9b5e9c..086d994 100644 (file)
--- a/pkgconfigs/wrt-plugins-tizen-log.pc.in
+++ b/pkgconfigs/wrt-plugins-tizen-log.pc.in
@@ -2,7 +2,7 @@ prefix=/usr
 project_name=@CMAKE_PROJECT_NAME@
 module_name=application
 exec_prefix=${prefix}
-libdir=${prefix}/lib/wrt-plugins/tizen-${module_name}
+libdir=@LIB_INSTALL_DIR@/wrt-plugins/tizen-${module_name}
 includedir=${prefix}/include/${project_name}
 
 Name: wrt-plugins-tizen-${module_name}
@@ -10,4 +10,4 @@ Description: wrt-plugins-tizen-${module_name}
 Version: @CMAKE_PROJECT_VERSION@
 Requires: capi-appfw-app-manager capi-appfw-application capi-appfw-package-manager wrt-deviceapis-commons wrt-deviceapis-commons-javascript pkgmgr pkgmgr-info
 Libs: -L${libdir} -lwrt-plugins-tizen-${module_name} -lwrt-plugins-tizen-${module_name}-impl -lwrt-plugins-tizen-${module_name}-config
-Cflags: -I${includedir}/${module_name}
\ No newline at end of file
+Cflags: -I${includedir}/${module_name}

diff --git a/pkgconfigs/wrt-plugins-tizen-messageport.pc.in b/pkgconfigs/wrt-plugins-tizen-messageport.pc.in
index 166ec31..b745cd0 100644 (file)
--- a/pkgconfigs/wrt-plugins-tizen-messageport.pc.in
+++ b/pkgconfigs/wrt-plugins-tizen-messageport.pc.in
@@ -2,7 +2,7 @@ prefix=/usr
 project_name=@CMAKE_PROJECT_NAME@
 module_name=messageport
 exec_prefix=${prefix}
-libdir=${prefix}/lib/wrt-plugins/tizen-${module_name}
+libdir=@LIB_INSTALL_DIR@/wrt-plugins/tizen-${module_name}
 includedir=${prefix}/include/${project_name}
 
 Name: wrt-plugins-tizen-${module_name}
@@ -10,4 +10,4 @@ Description: wrt-plugins-tizen-${module_name}
 Version: @CMAKE_PROJECT_VERSION@
 Requires: osp-appfw capi-appfw-app-manager
 Libs: -L${libdir} -lwrt-plugins-tizen-${module_name}-impl
-Cflags: -I${includedir}/${module_name}
\ No newline at end of file
+Cflags: -I${includedir}/${module_name}

diff --git a/pkgconfigs/wrt-plugins-tizen-messaging.pc.in b/pkgconfigs/wrt-plugins-tizen-messaging.pc.in
index b186586..9fc641b 100644 (file)
--- a/pkgconfigs/wrt-plugins-tizen-messaging.pc.in
+++ b/pkgconfigs/wrt-plugins-tizen-messaging.pc.in
@@ -2,7 +2,7 @@ prefix=/usr
 project_name=@CMAKE_PROJECT_NAME@
 module_name=messaging
 exec_prefix=${prefix}
-libdir=${prefix}/lib/wrt-plugins/tizen-${module_name}
+libdir=@LIB_INSTALL_DIR@/wrt-plugins/tizen-${module_name}
 includedir=${prefix}/include/${project_name}
 
 Name: wrt-plugins-tizen-${module_name}
@@ -10,4 +10,4 @@ Description: wrt-plugins-tizen-${module_name}
 Version: @CMAKE_PROJECT_VERSION@
 Requires: msg-service email-service dbus-1
 Libs: -L${libdir} -lwrt-plugins-tizen-${module_name}-impl
-Cflags: -I${includedir}/${module_name}
\ No newline at end of file
+Cflags: -I${includedir}/${module_name}

diff --git a/pkgconfigs/wrt-plugins-tizen-networkbearerselection.pc.in b/pkgconfigs/wrt-plugins-tizen-networkbearerselection.pc.in
index 421f6ee..551eb81 100644 (file)
--- a/pkgconfigs/wrt-plugins-tizen-networkbearerselection.pc.in
+++ b/pkgconfigs/wrt-plugins-tizen-networkbearerselection.pc.in
@@ -2,7 +2,7 @@ prefix=/usr
 project_name=@CMAKE_PROJECT_NAME@
 module_name=networkbearerselection
 exec_prefix=${prefix}
-libdir=${prefix}/lib/wrt-plugins/tizen-${module_name}
+libdir=@LIB_INSTALL_DIR@/wrt-plugins/tizen-${module_name}
 includedir=${prefix}/include/${project_name}
 
 Name: wrt-plugins-tizen-${module_name}
@@ -10,4 +10,4 @@ Description: wrt-plugins-tizen-${module_name}
 Version: @CMAKE_PROJECT_VERSION@
 Requires: capi-network-connection
 Libs: -L${libdir} -lwrt-plugins-tizen-${module_name}-impl
-Cflags: -I${includedir}/${module_name}
\ No newline at end of file
+Cflags: -I${includedir}/${module_name}

diff --git a/pkgconfigs/wrt-plugins-tizen-nfc.pc.in b/pkgconfigs/wrt-plugins-tizen-nfc.pc.in
index 187e0a1..9c2ebf8 100644 (file)
--- a/pkgconfigs/wrt-plugins-tizen-nfc.pc.in
+++ b/pkgconfigs/wrt-plugins-tizen-nfc.pc.in
@@ -2,7 +2,7 @@ prefix=/usr
 project_name=@CMAKE_PROJECT_NAME@
 module_name=nfc
 exec_prefix=${prefix}
-libdir=${prefix}/lib/wrt-plugins/tizen-${module_name}
+libdir=@LIB_INSTALL_DIR@/wrt-plugins/tizen-${module_name}
 includedir=${prefix}/include/${project_name}
 
 Name: wrt-plugins-tizen-${module_name}
@@ -10,4 +10,4 @@ Description: wrt-plugins-tizen-${module_name}
 Version: @CMAKE_PROJECT_VERSION@
 Requires: capi-network-nfc
 Libs: -L${libdir} -lwrt-plugins-tizen-${module_name}-impl
-Cflags: -I${includedir}/${module_name}
\ No newline at end of file
+Cflags: -I${includedir}/${module_name}

diff --git a/pkgconfigs/wrt-plugins-tizen-notification.pc.in b/pkgconfigs/wrt-plugins-tizen-notification.pc.in
index 8795fe0..90cfd7d 100644 (file)
--- a/pkgconfigs/wrt-plugins-tizen-notification.pc.in
+++ b/pkgconfigs/wrt-plugins-tizen-notification.pc.in
@@ -2,7 +2,7 @@ prefix=/usr
 project_name=@CMAKE_PROJECT_NAME@
 module_name=notification
 exec_prefix=${prefix}
-libdir=${prefix}/lib/wrt-plugins/tizen-${module_name}
+libdir=@LIB_INSTALL_DIR@/wrt-plugins/tizen-${module_name}
 includedir=${prefix}/include/${project_name}
 
 Name: wrt-plugins-tizen-${module_name}
@@ -10,4 +10,4 @@ Description: wrt-plugins-tizen-${module_name}
 Version: @CMAKE_PROJECT_VERSION@
 Requires: capi-appfw-application
 Libs: -L${libdir} -lwrt-plugins-tizen-${module_name}-impl
-Cflags: -I${includedir}/${module_name}
\ No newline at end of file
+Cflags: -I${includedir}/${module_name}

diff --git a/pkgconfigs/wrt-plugins-tizen-package.pc.in b/pkgconfigs/wrt-plugins-tizen-package.pc.in
index 5f80e24..506f4f8 100644 (file)
--- a/pkgconfigs/wrt-plugins-tizen-package.pc.in
+++ b/pkgconfigs/wrt-plugins-tizen-package.pc.in
@@ -2,7 +2,7 @@ prefix=/usr
 project_name=@CMAKE_PROJECT_NAME@
 module_name=package
 exec_prefix=${prefix}
-libdir=${prefix}/lib/wrt-plugins/tizen-${module_name}
+libdir=@LIB_INSTALL_DIR@/wrt-plugins/tizen-${module_name}
 includedir=${prefix}/include/${project_name}
 
 Name: wrt-plugins-tizen-${module_name}
@@ -10,4 +10,4 @@ Description: wrt-plugins-tizen-${module_name}
 Version: @CMAKE_PROJECT_VERSION@
 Requires: capi-appfw-app-manager capi-appfw-package-manager wrt-deviceapis-commons wrt-deviceapis-commons-javascript pkgmgr pkgmgr-info
 Libs: -L${libdir} -lwrt-plugins-tizen-${module_name}-impl
-Cflags: -I${includedir}/${module_name}
\ No newline at end of file
+Cflags: -I${includedir}/${module_name}

diff --git a/pkgconfigs/wrt-plugins-tizen-power.pc.in b/pkgconfigs/wrt-plugins-tizen-power.pc.in
index d113da9..255d87f 100644 (file)
--- a/pkgconfigs/wrt-plugins-tizen-power.pc.in
+++ b/pkgconfigs/wrt-plugins-tizen-power.pc.in
@@ -2,7 +2,7 @@ prefix=/usr
 project_name=@CMAKE_PROJECT_NAME@
 module_name=power
 exec_prefix=${prefix}
-libdir=${prefix}/lib/wrt-plugins/tizen-${module_name}
+libdir=@LIB_INSTALL_DIR@/wrt-plugins/tizen-${module_name}
 includedir=${prefix}/include/${project_name}
 
 Name: wrt-plugins-tizen-${module_name}
@@ -10,4 +10,4 @@ Description: wrt-plugins-tizen-${module_name}
 Version: @CMAKE_PROJECT_VERSION@
 Requires: capi-system-power pmapi capi-system-device
 Libs: -L${libdir} -lwrt-plugins-tizen-${module_name}-impl
-Cflags: -I${includedir}/${module_name}
\ No newline at end of file
+Cflags: -I${includedir}/${module_name}

diff --git a/pkgconfigs/wrt-plugins-tizen-push.pc.in b/pkgconfigs/wrt-plugins-tizen-push.pc.in
index a73a959..5994f41 100644 (file)
--- a/pkgconfigs/wrt-plugins-tizen-push.pc.in
+++ b/pkgconfigs/wrt-plugins-tizen-push.pc.in
@@ -2,7 +2,7 @@ prefix=/usr
 project_name=@CMAKE_PROJECT_NAME@
 module_name=push
 exec_prefix=${prefix}
-libdir=${prefix}/lib/wrt-plugins/tizen-${module_name}
+libdir=@LIB_INSTALL_DIR@/wrt-plugins/tizen-${module_name}
 includedir=${prefix}/include/${project_name}
 
 Name: wrt-plugins-tizen-${module_name}
@@ -10,4 +10,4 @@ Description: wrt-plugins-tizen-${module_name}
 Version: @CMAKE_PROJECT_VERSION@
 Requires: push capi-appfw-application
 Libs: -L${libdir} -lwrt-plugins-tizen-${module_name}
-Cflags: -I${includedir}/${module_name}
\ No newline at end of file
+Cflags: -I${includedir}/${module_name}

diff --git a/pkgconfigs/wrt-plugins-tizen-secureelement.pc.in b/pkgconfigs/wrt-plugins-tizen-secureelement.pc.in
index 25dce1b..44059ca 100644 (file)
--- a/pkgconfigs/wrt-plugins-tizen-secureelement.pc.in
+++ b/pkgconfigs/wrt-plugins-tizen-secureelement.pc.in
@@ -2,7 +2,7 @@ prefix=/usr
 project_name=@CMAKE_PROJECT_NAME@
 module_name=secureelement
 exec_prefix=${prefix}
-libdir=${prefix}/lib/wrt-plugins/tizen-${module_name}
+libdir=@LIB_INSTALL_DIR@/wrt-plugins/tizen-${module_name}
 includedir=${prefix}/include/${project_name}
 
 Name: wrt-plugins-tizen-${module_name}

diff --git a/pkgconfigs/wrt-plugins-tizen-systeminfo.pc.in b/pkgconfigs/wrt-plugins-tizen-systeminfo.pc.in
index 4219c95..c53b19e 100755 (executable)
--- a/pkgconfigs/wrt-plugins-tizen-systeminfo.pc.in
+++ b/pkgconfigs/wrt-plugins-tizen-systeminfo.pc.in
@@ -2,7 +2,7 @@ prefix=/usr
 project_name=@CMAKE_PROJECT_NAME@
 module_name=systeminfo
 exec_prefix=${prefix}
-libdir=${prefix}/lib/wrt-plugins/tizen-${module_name}
+libdir=@LIB_INSTALL_DIR@/wrt-plugins/tizen-${module_name}
 includedir=${prefix}/include/${project_name}
 
 Name: wrt-plugins-tizen-${module_name}
@@ -10,4 +10,4 @@ Description: wrt-plugins-tizen-${module_name}
 Version: @CMAKE_PROJECT_VERSION@
 Requires: capi-telephony-sim capi-network-connection capi-system-info capi-system-runtime-info capi-system-sensor sensor
 Libs: -L${libdir} -lwrt-plugins-tizen-${module_name}-impl
-Cflags: -I${includedir}/${module_name}
\ No newline at end of file
+Cflags: -I${includedir}/${module_name}

diff --git a/pkgconfigs/wrt-plugins-tizen-systemsetting.pc.in b/pkgconfigs/wrt-plugins-tizen-systemsetting.pc.in
index 690e4c2..c83c686 100644 (file)
--- a/pkgconfigs/wrt-plugins-tizen-systemsetting.pc.in
+++ b/pkgconfigs/wrt-plugins-tizen-systemsetting.pc.in
@@ -2,7 +2,7 @@ prefix=/usr
 project_name=@CMAKE_PROJECT_NAME@
 module_name=systemsetting
 exec_prefix=${prefix}
-libdir=${prefix}/lib/wrt-plugins/tizen-${module_name}
+libdir=@LIB_INSTALL_DIR@/wrt-plugins/tizen-${module_name}
 includedir=${prefix}/include/${project_name}
 
 Name: wrt-plugins-tizen-${module_name}
@@ -10,4 +10,4 @@ Description: wrt-plugins-tizen-${module_name}
 Version: @CMAKE_PROJECT_VERSION@
 Requires: capi-system-system-settings
 Libs: -L${libdir} -lwrt-plugins-tizen-${module_name}
-Cflags: -I${includedir}/${module_name}
\ No newline at end of file
+Cflags: -I${includedir}/${module_name}

diff --git a/pkgconfigs/wrt-plugins-tizen-timeutil.pc.in b/pkgconfigs/wrt-plugins-tizen-timeutil.pc.in
index a6bbc6b..2f54265 100644 (file)
--- a/pkgconfigs/wrt-plugins-tizen-timeutil.pc.in
+++ b/pkgconfigs/wrt-plugins-tizen-timeutil.pc.in
@@ -2,7 +2,7 @@ prefix=/usr
 project_name=@CMAKE_PROJECT_NAME@
 module_name=timeutil
 exec_prefix=${prefix}
-libdir=${prefix}/lib/wrt-plugins/tizen-${module_name}
+libdir=@LIB_INSTALL_DIR@/wrt-plugins/tizen-${module_name}
 includedir=${prefix}/include/${project_name}
 
 Name: wrt-plugins-tizen-${module_name}
@@ -10,4 +10,4 @@ Description: wrt-plugins-tizen-${module_name}
 Version: @CMAKE_PROJECT_VERSION@
 Requires: icu-i18n icu-io icu-le icu-lx icu-uc 
 Libs: -L${libdir} -lwrt-plugins-tizen-${module_name}-impl
-Cflags: -I${includedir}/${module_name}
\ No newline at end of file
+Cflags: -I${includedir}/${module_name}

diff --git a/pkgconfigs/wrt-plugins-tizen-tizen.pc.in b/pkgconfigs/wrt-plugins-tizen-tizen.pc.in
index 8b86ec4..00027f7 100644 (file)
--- a/pkgconfigs/wrt-plugins-tizen-tizen.pc.in
+++ b/pkgconfigs/wrt-plugins-tizen-tizen.pc.in
@@ -2,7 +2,7 @@ prefix=/usr
 project_name=@CMAKE_PROJECT_NAME@
 module_name=tizen
 exec_prefix=${prefix}
-libdir=${prefix}/lib/wrt-plugins/tizen-${module_name}
+libdir=@LIB_INSTALL_DIR@/wrt-plugins/tizen-${module_name}
 includedir=${prefix}/include/${project_name}
 
 Name: wrt-plugins-tizen-${module_name}
@@ -10,4 +10,4 @@ Description: wrt-plugins-tizen-${module_name}
 Version: @CMAKE_PROJECT_VERSION@
 Requires: wrt-plugins-plugin-manager
 Libs: -L${libdir} -lwrt-plugins-tizen-${module_name}-impl -lwrt-plugins-tizen-${module_name}-config
-Cflags: -I${includedir}/${module_name}
\ No newline at end of file
+Cflags: -I${includedir}/${module_name}

diff --git a/src/Application/ApplicationManager.h b/src/Application/ApplicationManager.h
index 65c080c..044cde8 100644 (file)
--- a/src/Application/ApplicationManager.h
+++ b/src/Application/ApplicationManager.h
@@ -126,7 +126,7 @@ template <class KeyType, class DataType>
 class KeyMultiMap
 {
 public:
-       typedef unsigned int                                DataKeyType;
+       typedef unsigned long                                DataKeyType;
        typedef DataType *                                  DataPtrType;
        typedef std::pair<KeyType, DataPtrType>             KeyDataPairType;
        typedef std::map<DataKeyType, KeyDataPairType>      DataMapType;