From 359a6cdc0ec13577bd31227d386c213467169f0a Mon Sep 17 00:00:00 2001
From: Vitor Sousa <vitorsousasilva@gmail.com>
Date: Thu, 25 Jan 2018 14:45:04 -0200
Subject: [PATCH] efl_mono: fix DLL instalation path on efl-mono.pc.in

Destination of libefl_mono.dll is OS dependent, this was not translated
to efl-mono.pc.in. This commit fix this issue.
---
 configure.ac             |  7 +++++++
 pc/efl-mono.pc.in        |  7 +++++--
 src/Makefile_Efl_Mono.am | 12 +++---------
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index 196ca21334..3079d9b492 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1355,6 +1355,13 @@ AC_DEFINE_IF([HAVE_CSHARP], [test "x${want_csharp}" = "xyes"],
   [1], [Compiling bindings for C Sharp])
 AC_SUBST([want_csharp])
 
+if test "x${have_windows}" = "xyes"; then
+  eflmonodlldir="$prefix/bin"
+else
+  eflmonodlldir="$libdir/efl-mono-${EFL_VERSION_MAJOR}"
+fi
+AC_SUBST([eflmonodlldir])
+
 # Efl Mono
 EFL_LIB_START_OPTIONAL([Efl_Mono], [test "x${want_csharp}" = "xyes"])
 
diff --git a/pc/efl-mono.pc.in b/pc/efl-mono.pc.in
index 8b4a147af3..2dfafea23f 100644
--- a/pc/efl-mono.pc.in
+++ b/pc/efl-mono.pc.in
@@ -5,11 +5,14 @@ includedir=@includedir@
 datarootdir=@datarootdir@
 datadir=@datadir@
 
+assemblies_dir=@eflmonodlldir@
+Libraries=${assemblies_dir}/libefl_mono.dll
+
 #variable to be used with meson
-mono_libs=-r:@prefix@/bin/libefl_mono.dll
+mono_libs=-r:${assemblies_dir}/libefl_mono.dll
 
 Name: EFL-Mono
 Description: EFL's C-Sharp bindings
 Version: @PACKAGE_VERSION@
-Libs: -r:${prefix}/bin/libefl_mono.dll
+Libs: -r:${assemblies_dir}/libefl_mono.dll
 
diff --git a/src/Makefile_Efl_Mono.am b/src/Makefile_Efl_Mono.am
index af85ab853b..96d8bf74be 100644
--- a/src/Makefile_Efl_Mono.am
+++ b/src/Makefile_Efl_Mono.am
@@ -206,16 +206,10 @@ lib/efl_mono/libefl_mono.dll.config:
 	echo "  <dllmap dll=\"elementary\" target=\"$(abs_top_builddir)/src/lib/elementary/.libs/libelementary.so\"/>" >> $@
 	echo "</configuration>" >> $@
 
-if HAVE_WIN32
-efl_mono_dll_dest = $(DESTDIR)$(bindir)
-else
-efl_mono_dll_dest = $(DESTDIR)$(libdir)/efl-mono-@VMAJ@
-endif
-
 EFL_INSTALL_EXEC_HOOK += \
-$(MKDIR_P) $(efl_mono_dll_dest); \
-cp -f $(builddir)/lib/efl_mono/libefl_mono.dll $(efl_mono_dll_dest)/libefl_mono.dll; \
-cp -f $(builddir)/lib/efl_mono/libefl_mono.xml $(efl_mono_dll_dest)/libefl_mono.xml; \
+$(MKDIR_P) @eflmonodlldir@; \
+cp -f $(builddir)/lib/efl_mono/libefl_mono.dll @eflmonodlldir@/libefl_mono.dll; \
+cp -f $(builddir)/lib/efl_mono/libefl_mono.xml @eflmonodlldir@/libefl_mono.xml; \
 $(MKDIR_P) $(DESTDIR)$(datadir)/efl_mono; \
 cp -f $(builddir)/bindings/mono/efl_mono/efl_libs.csv $(DESTDIR)$(datadir)/efl_mono/efl_libs.csv;