From ce8af90682e1212a4724d2cf4943916de0ca1f07 Mon Sep 17 00:00:00 2001 From: Pawel Andruszkiewicz Date: Tue, 8 Dec 2015 15:25:22 +0100 Subject: [PATCH] [Common] Fixed devel package for 64bit systems. [Verification] Code copiles on both armv7l and aarch64 systems. It's possible to use devel package on both of these systems. Change-Id: Ie6696536679dd869a2e0f02319bd45e5cefbe2b3 Signed-off-by: Pawel Andruszkiewicz --- packaging/{webapi-plugins.pc => webapi-plugins.pc.in} | 7 ++----- packaging/webapi-plugins.spec | 4 +++- 2 files changed, 5 insertions(+), 6 deletions(-) rename packaging/{webapi-plugins.pc => webapi-plugins.pc.in} (54%) mode change 100755 => 100644 diff --git a/packaging/webapi-plugins.pc b/packaging/webapi-plugins.pc.in old mode 100755 new mode 100644 similarity index 54% rename from packaging/webapi-plugins.pc rename to packaging/webapi-plugins.pc.in index 2cd06acd..e9cade25 --- a/packaging/webapi-plugins.pc +++ b/packaging/webapi-plugins.pc.in @@ -1,9 +1,6 @@ project_name=webapi-plugins -dirname=tizen-extensions-crosswalk -prefix=/usr -exec_prefix=${prefix} -libdir=${prefix}/lib/${dirname} -includedir=${prefix}/include/${project_name}/src +libdir=__LIB_DIR__ +includedir=__INCLUDE_DIR__ Name: ${project_name} Description: ${project_name} diff --git a/packaging/webapi-plugins.spec b/packaging/webapi-plugins.spec index 47c9d907..62ebda06 100644 --- a/packaging/webapi-plugins.spec +++ b/packaging/webapi-plugins.spec @@ -500,7 +500,9 @@ install -p -m 644 out/Default/libtizen*.so %{buildroot}%{crosswalk_extensions_pa # devel files mkdir -p %{buildroot}%{_libdir}/pkgconfig -cp packaging/%{name}.pc %{buildroot}%{_libdir}/pkgconfig +sed -i s,__LIB_DIR__,%{crosswalk_extensions_path},g packaging/%{name}.pc.in +sed -i s,__INCLUDE_DIR__,%{_includedir}/%{name}/src,g packaging/%{name}.pc.in +cp packaging/%{name}.pc.in %{buildroot}%{_libdir}/pkgconfig/%{name}.pc mkdir -p %{buildroot}%{_includedir}/%{name}/src/common install -p -m 644 src/common/*.h %{buildroot}%{_includedir}/%{name}/src/common install -p -m 644 src/common/*.gypi %{buildroot}%{_includedir}/%{name}/src/common -- 2.34.1