[FFmpeg-devel] Fw: [PATCH] configured dirs and *.pc off sync

[Michael Niedermayer]

see https://sourceforge.net/tracker/index.php?func=detail&aid=1540839&group_id=16082&atid=116082

"The written pkgconfig *.pc files do not honor --libdir
and --incdir given to configure. Here's a patch that
fixes those. Dunno if libdir should point to $libdir
or $shlibdir, I opted for the former."


-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Observe your enemies, for they first find out your faults. -- Antisthenes
-------------- next part --------------
Index: configure
===================================================================
--- configure	(revision 6000)
+++ configure	(working copy)
@@ -2132,7 +2132,7 @@
 cat <<EOF >libavutil.pc
 prefix=$PREFIX
 exec_prefix=\${prefix}
-libdir=\${exec_prefix}/lib
+libdir=$libdir
 includedir=\${prefix}/include
 
 Name: libavutil
@@ -2141,7 +2141,7 @@
 Requires:
 Conflicts:
 Libs: -L\${libdir} -lavutil
-Cflags: -I\${includedir} -I\${includedir}/ffmpeg
+Cflags: -I\${includedir} -I$incdir
 EOF
 
 cat <<EOF >libavutil-uninstalled.pc
@@ -2163,7 +2163,7 @@
 cat <<EOF >libavcodec.pc
 prefix=$PREFIX
 exec_prefix=\${prefix}
-libdir=\${exec_prefix}/lib
+libdir=$libdir
 includedir=\${prefix}/include
 
 Name: libavcodec
@@ -2172,7 +2172,7 @@
 Requires: $pkg_requires libavutil = $lavu_version
 Conflicts:
 Libs: -L\${libdir} -lavcodec $extralibs
-Cflags: -I\${includedir} -I\${includedir}/ffmpeg
+Cflags: -I\${includedir} -I$incdir
 EOF
 
 cat <<EOF >libavcodec-uninstalled.pc
@@ -2194,7 +2194,7 @@
 cat <<EOF >libavformat.pc
 prefix=$PREFIX
 exec_prefix=\${prefix}
-libdir=\${exec_prefix}/lib
+libdir=$libdir
 includedir=\${prefix}/include
 
 Name: libavformat
@@ -2203,7 +2203,7 @@
 Requires: $pkg_requires libavcodec = $lavc_version
 Conflicts:
 Libs: -L\${libdir} -lavformat $extralibs
-Cflags: -I\${includedir} -I\${includedir}/ffmpeg
+Cflags: -I\${includedir} -I$incdir
 EOF
 
 cat <<EOF >libavformat-uninstalled.pc
@@ -2226,7 +2226,7 @@
 cat <<EOF >libpostproc.pc
 prefix=$PREFIX
 exec_prefix=\${prefix}
-libdir=\${exec_prefix}/lib
+libdir=$libdir
 includedir=\${prefix}/include
 
 Name: libpostproc
@@ -2257,7 +2257,7 @@
 cat <<EOF >libswscale.pc
 prefix=$PREFIX
 exec_prefix=\${prefix}
-libdir=\${exec_prefix}/lib
+libdir=$libdir
 includedir=\${prefix}/include
 
 Name: libswscale
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20070531/6ed98528/attachment.pgp>