[DVDnav-discuss] [PATCH] fix dvdnav-config when libdir is not $prefix/lib

[Dominik 'Rathann' Mierzejewski]

On Wednesday, 21 November 2007 at 18:27, Nico Sabbi wrote:
> Il Wednesday 21 November 2007 18:19:49 Dominik 'Rathann' Mierzejewski 
> ha scritto:
> > Fix dvdnav-config in case libdir != $prefix/lib.
> >
> > Regards,
> > R.
> 
> 
> forgotten something? :)

D'oh.

Attached.

-- 
Fedora contributor http://fedoraproject.org/wiki/DominikMierzejewski
Livna contributor http://rpm.livna.org MPlayer developer http://mplayerhq.hu
"Faith manages."
        -- Delenn to Lennier in Babylon 5:"Confessions and Lamentations"
-------------- next part --------------
Index: misc/dvdnav-config2.sh
===================================================================
--- misc/dvdnav-config2.sh	(revision 966)
+++ misc/dvdnav-config2.sh	(working copy)
@@ -73,9 +73,9 @@
 fi
 
 if test "$echo_libs" = "yes"; then
-      echo -L$prefix/lib -ldvdnav $dvdreadlib $threadlib
+      echo -L$libdir -ldvdnav $dvdreadlib $threadlib
 fi      
 
 if test "$echo_minilibs" = "yes"; then
-      echo -L$prefix/lib -ldvdnavmini $threadlib
+      echo -L$libdir -ldvdnavmini $threadlib
 fi
Index: Makefile
===================================================================
--- Makefile	(revision 966)
+++ Makefile	(working copy)
@@ -159,6 +159,7 @@
 
 dvdnav-config: $(.OBJDIR)
 	echo -e '#!/bin/sh\n\nprefix='$(PREFIX)'\n' > $(.OBJDIR)/dvdnav-config
+	echo -e 'libdir='$(shlibdir)'\n' >> $(.OBJDIR)/dvdnav-config
 	echo -e 'version='$(SHLIB_VERSION)'\n' >> $(.OBJDIR)/dvdnav-config
 	echo -e 'dvdread='$(DVDREAD)'\n' >> $(.OBJDIR)/dvdnav-config
 	echo -e 'dvdreaddir='$(DVDREAD_DIR)'\n' >> $(.OBJDIR)/dvdnav-config