fix wrong path in package config file

It fails when adding capi-network-wifi-mesh devel package to SDK root
strap because of wrong path in package config file. This patch changes
wrong parameters in CMakefiles.txt and capi-network-wifi-mesh.spec
files.

Change-Id: Iad4fd05ea52607906bb3abd9a7a079e4331bc3ce
Signed-off-by: saerome.kim <saerome.kim@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7de7068..3f04c32 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,8 +11,8 @@ SET(LIBDIR ${PREFIX}/${LIB_PATH})
 SET(INC_DIR include)
 INCLUDE_DIRECTORIES(${INC_DIR})
 
-SET(dependents "dlog capi-base-common capi-system-info glib-2.0 gio-2.0")
-SET(pc_dependents "capi-base-common")
+SET(dependents "dlog capi-system-info glib-2.0 gio-2.0")
+SET(pc_dependents "")
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(${fw_name} REQUIRED ${dependents} ${APPFW_REQUIRED_PKGS})

diff --git a/capi-network-wifi-mesh.pc.in b/capi-network-wifi-mesh.pc.in
index 2b4a65f..ae2a342 100644 (file)
--- a/capi-network-wifi-mesh.pc.in
+++ b/capi-network-wifi-mesh.pc.in
@@ -1,9 +1,9 @@
 # Package Information for pkg-config
 
-prefix=@CMAKE_INSTALL_PREFIX@
+prefix=@PREFIX@
 exec_prefix=${prefix}/bin
 libdir=@LIB_INSTALL_DIR@
-includedir=${prefix}/include/network
+includedir=@INCLUDE_INSTALL_DIR@/network
 
 Name: @PC_NAME@
 Description: @PACKAGE_DESCRIPTION@

diff --git a/packaging/capi-network-wifi-mesh.spec b/packaging/capi-network-wifi-mesh.spec
index a8b13c5..b5d4c36 100644 (file)
--- a/packaging/capi-network-wifi-mesh.spec
+++ b/packaging/capi-network-wifi-mesh.spec
@@ -14,7 +14,6 @@ BuildRequires:  cmake
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(capi-base-common)
 BuildRequires:  pkgconfig(capi-system-info)
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -39,6 +38,7 @@ MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
        -DLIB_INSTALL_DIR=%{_libdir} \
        -DBIN_INSTALL_DIR=%{_bindir} \
+       -DINCLUDE_INSTALL_DIR=%{_includedir} \
        -DLIB_PATH=%{_lib} \
        -DFULLVER=%{version} \
        -DMAJORVER=${MAJORVER}