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

[Oliver Sander]

Hi Markus,
thanks for the fix.  I am afraid, however, that this will break on
other platforms.  Because when you have, e.g., a 32Bit System or
a kfreebsd kernel, then the directory X64_64-linux-gnu will be named
differently (that's the new Debian multiarch feature).  Okay,
x64_64-linux-gnu will be by far the most common, but still.

I don't really know what the proper fix is.  On Debian machines,
you get the proper directory name using

dpkg-architecture -qDEB_HOST_MULTIARCH

But using that is still a Debianism in a file that should be
architecture-agnostic.

best,
Oliver


Am 22.05.2012 15:18, schrieb mblatt at dune-project.org:
> 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
>   	  path=$(canonicalname "$path/../../../")
>         export module_inst="yes"
>     fi
>
>
> _______________________________________________
> Dune-Commit mailing list
> Dune-Commit at dune-project.org
> http://lists.dune-project.org/mailman/listinfo/dune-commit