[Mesa-dev] [PATCH] targets/(vdpau|xvmc): hardlink against the installed library

[Emil Velikov]

Previous two commits, resolved the symlink generation required
by the versioning of the library and incorrectly changed the
way hardlinks are created by linking 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 at gmail.com>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---

Andy does this fixes the problem ?

Cheers
Emil 

 src/gallium/targets/vdpau/Makefile.am | 4 ++--
 src/gallium/targets/xvmc/Makefile.am  | 2 +-
 2 files changed, 3 insertions(+), 3 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.*
diff --git a/src/gallium/targets/xvmc/Makefile.am b/src/gallium/targets/xvmc/Makefile.am
index 6e81e08..bf986f4 100644
--- 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);	\
-- 
2.0.0