Contrib: fix libcdio cdparanoia pkgconfig files installation.

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index abf959348270afe8b98781b2248894fdc293a4f3..5e8c315d83b71df32017d961209c246b878d3bf3 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1459,9 +1459,10 @@ libcdio-$(CDIO_VERSION).tar.gz:
 
 libcdio: libcdio-$(CDIO_VERSION).tar.gz
        $(EXTRACT_GZ)
+       patch -p0 < Patches/libcdio-install-cdparanoia-pc.patch
 
 .cdio: libcdio
-       (cd $<; sed -e 's%@ENABLE_CPP_TRUE@SUBDIRS = C++%@ENABLE_CPP_TRUE@SUBDIRS = %' -i.orig example/Makefile.in && ./configure --prefix=$(PREFIX) --without-vcdinfo --disable-shared && make && make install)
+       (cd $<; sed -e 's%@ENABLE_CPP_TRUE@SUBDIRS = C++%@ENABLE_CPP_TRUE@SUBDIRS = %' -i.orig example/Makefile.in && autoreconf -fisv && ./configure --prefix=$(PREFIX) --without-vcdinfo --disable-shared && make && make install)
        touch $@
 
 CLEAN_FILE += .cdio

diff --git a/extras/contrib/src/Patches/libcdio-install-cdparanoia-pc.patch b/extras/contrib/src/Patches/libcdio-install-cdparanoia-pc.patch
new file mode 100644 (file)
index 0000000..1d80c72
--- /dev/null
+++ b/extras/contrib/src/Patches/libcdio-install-cdparanoia-pc.patch
@@ -0,0 +1,13 @@
+--- libcdio/Makefile.am        2008-03-15 19:21:28.000000000 +0300
++++ libcdio.patched/Makefile.am        2008-04-04 03:29:17.000000000 +0400
+@@ -48,8 +48,8 @@
+                libcdio++.pc  \
+                libiso9660.pc \
+                libiso9660++.pc \
+-               libudf.pc
+-               $(paranoiapcs)
++               libudf.pc \
++                       $(paranoiapcs)
+ 
+ 
+ $(pkgconfig_DATA): config.status