cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=8676b03fc06bfe0d10ddc2b9eea1f2d443664f78
commit 8676b03fc06bfe0d10ddc2b9eea1f2d443664f78 Author: Savio Sena <[email protected]> Date: Fri May 9 12:47:26 2014 +0200 eolian: fix pkg-config eoincludedir variable to point to @datadir@ instead of @datarootdir@. Summary: .eo files are installed at $(datadir)/eolian/include/ actually. The set-up fails when configure --datadir is different from --datarootdir. Reviewers: cedric, JackDanielZ CC: felipealmeida, cedric Differential Revision: https://phab.enlightenment.org/D838 Signed-off-by: Cedric Bail <[email protected]> --- pc/ecore-cxx.pc.in | 2 +- pc/ecore.pc.in | 2 +- pc/edje-cxx.pc.in | 2 +- pc/edje.pc.in | 2 +- pc/eo.pc.in | 2 +- pc/eolian.pc.in | 2 +- pc/evas-cxx.pc.in | 3 +-- pc/evas.pc.in | 2 +- 8 files changed, 8 insertions(+), 9 deletions(-) diff --git a/pc/ecore-cxx.pc.in b/pc/ecore-cxx.pc.in index 3951447..9f84f6c 100644 --- a/pc/ecore-cxx.pc.in +++ b/pc/ecore-cxx.pc.in @@ -4,7 +4,7 @@ libdir=@libdir@ includedir=@includedir@ modules=@libdir@/ecore module_arch=@MODULE_ARCH@ -eoincludedir=@datarootdir@/eolian/include +eoincludedir=@datadir@/eolian/include eolian_flags=-I${eoincludedir}/ecore-@VMAJ@ Name: ecore C++ API diff --git a/pc/ecore.pc.in b/pc/ecore.pc.in index 729f98f..39cc06b 100644 --- a/pc/ecore.pc.in +++ b/pc/ecore.pc.in @@ -4,7 +4,7 @@ libdir=@libdir@ includedir=@includedir@ modules=@libdir@/ecore module_arch=@MODULE_ARCH@ -eoincludedir=@datarootdir@/eolian/include +eoincludedir=@datadir@/eolian/include eolian_flags=-I${eoincludedir}/ecore-@VMAJ@ Name: ecore diff --git a/pc/edje-cxx.pc.in b/pc/edje-cxx.pc.in index 45e47c4..6e19ddd 100644 --- a/pc/edje-cxx.pc.in +++ b/pc/edje-cxx.pc.in @@ -11,7 +11,7 @@ vmin=@VMIN@ vmic=@VMIC@ multisense=@want_multisense@ physics=@want_physics@ -eoincludedir=@datarootdir@/eolian/include +eoincludedir=@datadir@/eolian/include eolian_flags=-I${eoincludedir}/edje-@VMAJ@ Name: edje C++ API diff --git a/pc/edje.pc.in b/pc/edje.pc.in index 825c934..8c0c33d 100644 --- a/pc/edje.pc.in +++ b/pc/edje.pc.in @@ -11,7 +11,7 @@ vmin=@VMIN@ vmic=@VMIC@ multisense=@want_multisense@ physics=@want_physics@ -eoincludedir=@datarootdir@/eolian/include +eoincludedir=@datadir@/eolian/include eolian_flags=-I${eoincludedir}/edje-@VMAJ@ Name: edje diff --git a/pc/eo.pc.in b/pc/eo.pc.in index 5d737a3..c7218ea 100644 --- a/pc/eo.pc.in +++ b/pc/eo.pc.in @@ -2,7 +2,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -eoincludedir=@datarootdir@/eolian/include +eoincludedir=@datadir@/eolian/include eolian_flags=-I${eoincludedir}/eo-@VMAJ@ Name: Eo diff --git a/pc/eolian.pc.in b/pc/eolian.pc.in index 3784ff0..0e7abbc 100644 --- a/pc/eolian.pc.in +++ b/pc/eolian.pc.in @@ -2,7 +2,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -eoincludedir=@datarootdir@/eolian/include +eoincludedir=@datadir@/eolian/include Name: eolian Description: EFL's .eo parser and code generator. diff --git a/pc/evas-cxx.pc.in b/pc/evas-cxx.pc.in index eb22b99..1279c0a 100644 --- a/pc/evas-cxx.pc.in +++ b/pc/evas-cxx.pc.in @@ -2,7 +2,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -eoincludedir=@datarootdir@/eolian/include +eoincludedir=@datadir@/eolian/include eolian_flags=-I${eoincludedir}/evas-cxx-@VMAJ@ Name: evas @@ -12,4 +12,3 @@ Version: @VERSION@ Libs: -L${libdir} -levas Libs.private: @requirements_libs_evas@ Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/evas-@VMAJ@ -I${includedir}/evas-cxx-@VMAJ@ - diff --git a/pc/evas.pc.in b/pc/evas.pc.in index a0f4814..4d16723 100644 --- a/pc/evas.pc.in +++ b/pc/evas.pc.in @@ -2,7 +2,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -eoincludedir=@datarootdir@/eolian/include +eoincludedir=@datadir@/eolian/include eolian_flags=-I${eoincludedir}/evas-@VMAJ@ Name: evas --
