[DVDnav-discuss] r968 - in trunk/libdvdnav: Makefile misc/dvdnav-config2.sh

[rathann]

Author: rathann
Date: Wed Nov 21 21:40:15 2007
New Revision: 968

Log:
Fix dvdnav-config in case libdir is not /lib

Modified:
   trunk/libdvdnav/Makefile
   trunk/libdvdnav/misc/dvdnav-config2.sh

Modified: trunk/libdvdnav/Makefile
==============================================================================
--- trunk/libdvdnav/Makefile	(original)
+++ trunk/libdvdnav/Makefile	Wed Nov 21 21:40:15 2007
@@ -159,6 +159,7 @@ distclean: clean
 
 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

Modified: trunk/libdvdnav/misc/dvdnav-config2.sh
==============================================================================
--- trunk/libdvdnav/misc/dvdnav-config2.sh	(original)
+++ trunk/libdvdnav/misc/dvdnav-config2.sh	Wed Nov 21 21:40:15 2007
@@ -73,9 +73,9 @@ if test "$echo_minicflags" = "yes"; then
 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