[Dune] [Dune-Commit] dune-common r6746 - trunk/lib

[Christian Engwer]

Hi Markus,

On Tue, May 22, 2012 at 03:18:31PM +0200, mblatt at dune-project.org wrote:
> Author: mblatt
> Date: 2012-05-22 15:18:31 +0200 (Tue, 22 May 2012)
> New Revision: 6746
> 
> Modified:
>    trunk/lib/dunemodules.lib
> Log:
> On Debian ${name}.pc gets install into
> ${libdir}/x86_64-linux-gnu/pkgconfig/.
> Honor this setting when checking whether the module is installed.
> 
> Fixes flyspray 1100 for me.
> 
> 
> Modified: trunk/lib/dunemodules.lib
> ===================================================================
> --- trunk/lib/dunemodules.lib	2012-05-22 12:07:01 UTC (rev 6745)
> +++ trunk/lib/dunemodules.lib	2012-05-22 13:18:31 UTC (rev 6746)
> @@ -69,7 +69,8 @@
>    # - source module: ${path}/dune.module
>    #   and there is a file ${path}/${name}.pc.in
>    local path="$(canonicalpath "$1")"
> -  if test -f $path/../../pkgconfig/${name}.pc; then
> +  if test -f $path/../../pkgconfig/${name}.pc -o\
> +     -f $path/../../x86_64-linux-gnu/pkgconfig/${name}.pc; then
                       ^^^^^^
this is the arch name and might fail on other architectures...

Christian