targets/(vdpau|xvmc): hardlink against the installed library

With commit 11e46a32aed and f9ebb1ea771 we resolved the symlink
generation required by the versioning of the library.
Although they incorrectly changed the way hardlinks are created by
linking to the ones from the build tree. If the device used for
building differs from the one set as destination linking will fail.

Reported-by: Andy Furniss <adf.lists@gmail.com>
Tested-by: Andy Furniss <adf.lists@gmail.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>

diff --git a/src/gallium/targets/vdpau/Makefile.am b/src/gallium/targets/vdpau/Makefile.am
index 9920bd9b4e1493e7e8a4663aa153879050adbc52..2059274b049be447d60fce6a7e34f77dc978501a 100644 (file)
--- a/src/gallium/targets/vdpau/Makefile.am
+++ b/src/gallium/targets/vdpau/Makefile.am
@@ -131,7 +131,7 @@ install-data-hook:
                j=libvdpau_gallium.$(LIB_EXT);                          \
                k=libvdpau_$${i}.$(LIB_EXT);                            \
                l=$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0;                \
-               ln -f .libs/$${j}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0       \
+               ln -f $${dest_dir}/$${j}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0 \
                      $${dest_dir}/$${l};                               \
                ln -sf $${l}                                            \
                       $${dest_dir}/$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR); \
@@ -140,4 +140,4 @@ install-data-hook:
                ln -sf $${l}                                            \
                       $${dest_dir}/$${k};                              \
        done;                                                           \
-       $(RM) -f $$dest_dir/libvdpau_gallium.*
+       $(RM) -f $${dest_dir}/libvdpau_gallium.*

diff --git a/src/gallium/targets/xvmc/Makefile.am b/src/gallium/targets/xvmc/Makefile.am
index 6e81e085cb63bc80d64c7a048c5b7f4f9aff0962..bf986f47f485a220e7000d1f1bdb103a0284a1d3 100644 (file)
--- a/src/gallium/targets/xvmc/Makefile.am
+++ b/src/gallium/targets/xvmc/Makefile.am
@@ -88,7 +88,7 @@ install-data-hook:
                j=libXvMCgallium.$(LIB_EXT);                            \
                k=libXvMC$${i}.$(LIB_EXT);                              \
                l=$${k}.$(XVMC_MAJOR).$(XVMC_MINOR).0;                  \
-               ln -f .libs/$${j}.$(XVMC_MAJOR).$(XVMC_MINOR).0         \
+               ln -f $${dest_dir}/$${j}.$(XVMC_MAJOR).$(XVMC_MINOR).0  \
                      $${dest_dir}/$${l};                               \
                ln -sf $${l}                                            \
                       $${dest_dir}/$${k}.$(XVMC_MAJOR).$(XVMC_MINOR);  \