[vlc-devel] commit: Contrib: fix libcdio cdparanoia pkgconfig files installation. ( Pavlov Konstantin )

[git version control]

vlc | branch: master | Pavlov Konstantin <thresh at videolan.org> | Fri Apr  4 04:04:29 2008 +0400| [75588190d9df465b062cdd8ed2d782c87f1a0113]

Contrib: fix libcdio cdparanoia pkgconfig files installation.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=75588190d9df465b062cdd8ed2d782c87f1a0113
---

 extras/contrib/src/Makefile                        |    3 ++-
 .../Patches/libcdio-install-cdparanoia-pc.patch    |   13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index abf9593..5e8c315 100644
--- 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 at SUBDIRS = C++%@ENABLE_CPP_TRUE at SUBDIRS = %' -i.orig example/Makefile.in && ./configure --prefix=$(PREFIX) --without-vcdinfo --disable-shared && make && make install)
+	(cd $<; sed -e 's%@ENABLE_CPP_TRUE at SUBDIRS = C++%@ENABLE_CPP_TRUE at 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
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