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.
devs/larrylira/efl_ui_list
Vitor Sousa 5 years ago committed by Lauro Moura
parent e70368f10e
commit 359a6cdc0e
  1. 7
      configure.ac
  2. 7
      pc/efl-mono.pc.in
  3. 12
      src/Makefile_Efl_Mono.am

@ -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"])

@ -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

@ -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;

Loading…
Cancel
Save