summaryrefslogtreecommitdiffstats
path: root/src/gallium/targets/vdpau
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2014-06-23 18:30:00 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2014-06-23 20:57:01 +0100
commit2442d3553fc06595c8c324bd50628da54e269364 (patch)
tree884e400c12cf49ee1bdd68d173f4fc8bc4f1ee5c /src/gallium/targets/vdpau
parent5f11b10f2c6a7dc94b8abdbffb755505f8a3a0ec (diff)
downloadexternal_mesa3d-2442d3553fc06595c8c324bd50628da54e269364.zip
external_mesa3d-2442d3553fc06595c8c324bd50628da54e269364.tar.gz
external_mesa3d-2442d3553fc06595c8c324bd50628da54e269364.tar.bz2
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>
Diffstat (limited to 'src/gallium/targets/vdpau')
-rw-r--r--src/gallium/targets/vdpau/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/targets/vdpau/Makefile.am b/src/gallium/targets/vdpau/Makefile.am
index 9920bd9..2059274 100644
--- 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.*