Alexandre Julliard : configure: Store all libraries in libdir on Android.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 770d902d10ab7d3ca096a4cd099fa52ca1abe711
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=770d902d10ab7d3ca096a4cd09...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Thu Sep 26 17:58:38 2013 +0200

configure: Store all libraries in libdir on Android.

---

 Make.vars.in |    2 +-
 configure    |    4 ++++
 configure.ac |    2 ++
 3 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/Make.vars.in b/Make.vars.in
index 133da5f..ea3869d 100644
--- a/Make.vars.in
+++ b/Make.vars.in
@@ -10,7 +10,7 @@ infodir         = @infodir@
 mandir          = @mandir@
 fontdir         = $(datadir)/wine/fonts
 includedir      = @includedir@/wine
-dlldir          = @libdir@/wine
+dlldir          = @dlldir@
 fakedlldir      = $(dlldir)/fakedlls
 top_srcdir      = @top_srcdir@
 top_builddir    = @top_builddir@
diff --git a/configure b/configure
index 317bade..a296e67 100755
--- a/configure
+++ b/configure
@@ -715,6 +715,7 @@ IMPLIBEXT
 DLLFLAGS
 DLLPREFIX
 DLLEXT
+dlldir
 CPP
 OPENGL_LIBS
 XLIB
@@ -6408,6 +6409,8 @@ done
 
 
 
+dlldir="\${libdir}/wine"
+
 DLLEXT=""
 
 DLLPREFIX=""
@@ -6904,6 +6907,7 @@ clean::
     DLLFLAGS="$DLLFLAGS -fPIC"
     DLLEXT=".so"
     DLLPREFIX="lib"
+    dlldir="\${libdir}"
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--export-dynamic" >&5
 $as_echo_n "checking whether the compiler supports -fPIC -Wl,--export-dynamic... " >&6; }
 if ${ac_cv_cflags__fPIC__Wl___export_dynamic+:} false; then :
diff --git a/configure.ac b/configure.ac
index 8ac0216..dacee3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -676,6 +676,7 @@ AC_CHECK_HEADERS([libprocstat.h],,,
 
 dnl **** Check for working dll ****
 
+AC_SUBST(dlldir,"\${libdir}/wine")
 AC_SUBST(DLLEXT,"")
 AC_SUBST(DLLPREFIX,"")
 AC_SUBST(DLLFLAGS,"-D_REENTRANT")
@@ -873,6 +874,7 @@ clean::
     DLLFLAGS="$DLLFLAGS -fPIC"
     DLLEXT=".so"
     DLLPREFIX="lib"
+    dlldir="\${libdir}"
     WINE_TRY_CFLAGS([-fPIC -Wl,--export-dynamic],
                     [AC_SUBST(LDEXECFLAGS,["-Wl,--export-dynamic"])])
     WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib],