Commit f66f01a1 authored by Rafaël Carré's avatar Rafaël Carré

Fix FFmpeg .pc creation - patch to be sent at FFmpeg developers

parent 213cea9c
...@@ -1068,6 +1068,7 @@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2 ...@@ -1068,6 +1068,7 @@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2
ifdef SVN ifdef SVN
ffmpeg: ffmpeg:
$(SVN) co $(FFMPEG_SVN) ffmpeg -r 12920 $(SVN) co $(FFMPEG_SVN) ffmpeg -r 12920
(cd $@; patch -p0 < ../Patches/ffmpeg-pkg-config.patch)
ifeq ($(HOST),i586-pc-beos) ifeq ($(HOST),i586-pc-beos)
(cd $@; patch -p0 < ../Patches/ffmpeg-svn-beos.patch) (cd $@; patch -p0 < ../Patches/ffmpeg-svn-beos.patch)
endif endif
......
Index: configure
===================================================================
--- configure (révision 13435)
+++ configure (copie de travail)
@@ -2169,11 +2169,13 @@
version=$3
libs=$4
requires=$5
+libdir_pc=`echo $libdir|sed s'|$(PREFIX)|${prefix}|'`
+incdir_pc=`echo $incdir|sed 's|$(PREFIX)|${prefix}|'`
cat <<EOF > $name.pc
prefix=$prefix
exec_prefix=\${prefix}
-libdir=$libdir
-includedir=$incdir
+libdir=$libdir_pc
+includedir=$incdir_pc
Name: $name
Description: $comment
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment