55 lines
1.9 KiB
Diff
55 lines
1.9 KiB
Diff
diff -up libdvdread-4.1.3/Makefile.multilib libdvdread-4.1.3/Makefile
|
|
--- libdvdread-4.1.3/Makefile.multilib 2008-08-31 04:27:37.000000000 -0500
|
|
+++ libdvdread-4.1.3/Makefile 2009-06-27 20:50:40.149705039 -0500
|
|
@@ -130,11 +130,11 @@ distclean: clean
|
|
|
|
dvdread-config: $(.OBJDIR)/dvdread-config
|
|
$(.OBJDIR)/dvdread-config: $(BUILDDEPS)
|
|
- @echo '#!/bin/sh' > $(.OBJDIR)/dvdread-config
|
|
- @echo 'prefix='$(PREFIX) >> $(.OBJDIR)/dvdread-config
|
|
- @echo 'libdir='$(shlibdir) >> $(.OBJDIR)/dvdread-config
|
|
- @echo 'version='$(SHLIB_VERSION) >> $(.OBJDIR)/dvdread-config
|
|
- @echo >> $(.OBJDIR)/dvdread-config
|
|
+ echo '#!/bin/sh' > $(.OBJDIR)/dvdread-config
|
|
+ #echo 'prefix='$(PREFIX) >> $(.OBJDIR)/dvdread-config
|
|
+ #echo 'libdir='$(shlibdir) >> $(.OBJDIR)/dvdread-config
|
|
+ #echo 'version='$(SHLIB_VERSION) >> $(.OBJDIR)/dvdread-config
|
|
+ echo >> $(.OBJDIR)/dvdread-config
|
|
cat $(SRC_PATH_BARE)/misc/dvdread-config.sh >> $(.OBJDIR)/dvdread-config
|
|
chmod 0755 $(.OBJDIR)/dvdread-config
|
|
|
|
diff -up libdvdread-4.1.3/misc/dvdread-config.sh.multilib libdvdread-4.1.3/misc/dvdread-config.sh
|
|
--- libdvdread-4.1.3/misc/dvdread-config.sh.multilib 2008-04-19 15:18:35.000000000 -0500
|
|
+++ libdvdread-4.1.3/misc/dvdread-config.sh 2009-06-27 20:49:36.676703194 -0500
|
|
@@ -1,4 +1,3 @@
|
|
-dvdreadlib="-ldvdread"
|
|
|
|
usage()
|
|
{
|
|
@@ -28,7 +27,7 @@ while test $# -gt 0; do
|
|
echo_prefix=yes
|
|
;;
|
|
--version)
|
|
- echo $version
|
|
+ echo `pkg-config --modversion dvdread`
|
|
;;
|
|
--cflags)
|
|
echo_cflags=yes
|
|
@@ -44,13 +43,13 @@ while test $# -gt 0; do
|
|
done
|
|
|
|
if test "$echo_prefix" = "yes"; then
|
|
- echo $prefix
|
|
+ echo `pkg-config --variable=prefix dvdread`
|
|
fi
|
|
|
|
if test "$echo_cflags" = "yes"; then
|
|
- echo -I$prefix/include $extracflags
|
|
+ echo `pkg-config --cflags dvdread`
|
|
fi
|
|
|
|
if test "$echo_libs" = "yes"; then
|
|
- echo -L$libdir $dvdreadlib
|
|
+ echo `pkg-config --libs dvdread`
|
|
fi
|