From: Lars-Peter Clausen Date: Tue, 14 Oct 2008 11:42:23 +0000 (+0000) Subject: Fix ffmpeg pkg-config files. X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=39b2ac9b9670ee2ecede832412b6fcf0ccefd1c6;ds=sidebyside Fix ffmpeg pkg-config files. SVN-Revision: 12979 --- diff --git a/multimedia/ffmpeg/patches/010-fix-pkg-config-files.patch b/multimedia/ffmpeg/patches/010-fix-pkg-config-files.patch new file mode 100644 index 0000000000..faefee1da2 --- /dev/null +++ b/multimedia/ffmpeg/patches/010-fix-pkg-config-files.patch @@ -0,0 +1,28 @@ +--- a/configure ++++ b/configure +@@ -881,11 +881,11 @@ logfile="config.err" + + # installation paths + prefix="/usr/local" +-libdir='$(PREFIX)/lib' ++libdir='${prefix}/lib' + shlibdir="$libdir" +-incdir='$(PREFIX)/include' +-mandir='$(PREFIX)/share/man' +-bindir='$(PREFIX)/bin' ++incdir='${prefix}/include' ++mandir='${prefix}/share/man' ++bindir='${prefix}/bin' + + # toolchain + cc="gcc" +@@ -1936,8 +1936,7 @@ echo "#ifndef FFMPEG_CONFIG_H" >> $TMPH + echo "#define FFMPEG_CONFIG_H" >> $TMPH + echo "#define FFMPEG_CONFIGURATION \"$FFMPEG_CONFIGURATION\"" >> $TMPH + +-echo "PREFIX=$prefix" >> config.mak +-echo "prefix=\$(DESTDIR)\$(PREFIX)" >> config.mak ++echo "prefix=$prefix" >> config.mak + echo "LIBDIR=\$(DESTDIR)$libdir" >> config.mak + echo "SHLIBDIR=\$(DESTDIR)$shlibdir" >> config.mak + echo "INCDIR=\$(DESTDIR)$incdir" >> config.mak