Commit 1d67a1d4 authored by Diego Biurrun's avatar Diego Biurrun

Add incdir to configure.

Originally committed as revision 4985 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent a4848db6
......@@ -14,6 +14,7 @@ echo "Standard options:"
echo " --help print this message"
echo " --prefix=PREFIX install in PREFIX [$prefix]"
echo " --libdir=DIR install libs in DIR [PREFIX/lib]"
echo " --incdir=DIR install includes in DIR [PREFIX/include/ffmpeg]"
echo " --mandir=DIR install man page in DIR [PREFIX/man]"
echo " --enable-mp3lame enable MP3 encoding via libmp3lame [default=no]"
echo " --enable-libogg enable Ogg support via libogg [default=no]"
......@@ -116,6 +117,7 @@ TMPH="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.h"
# default parameters
prefix="/usr/local"
libdir=""
incdir=""
mandir=""
bindir=""
cross_prefix=""
......@@ -463,6 +465,8 @@ for opt do
;;
--libdir=*) libdir=`echo $opt | cut -d '=' -f 2`; force_libdir=yes
;;
--incdir=*) incdir=`echo $opt | cut -d '=' -f 2`;
;;
--mandir=*) mandir=`echo $opt | cut -d '=' -f 2`
;;
--source-path=*) source_path=`echo $opt | cut -d '=' -f 2`
......@@ -1301,6 +1305,10 @@ if test x"$libdir" = x""; then
libdir="${prefix}/lib"
fi
if test x"$incdir" = x""; then
libdir="${prefix}/include/ffmpeg"
fi
if test x"$mandir" = x""; then
mandir="${prefix}/man"
fi
......@@ -1387,6 +1395,7 @@ echo "#define FFMPEG_CONFIGURATION "'"'"$FFMPEG_CONFIGURATION"'"' >> $TMPH
echo "prefix=\$(DESTDIR)$prefix" >> config.mak
echo "libdir=\$(DESTDIR)$libdir" >> config.mak
echo "incdir=\$(DESTDIR)$incdir" >> config.mak
echo "bindir=\$(DESTDIR)$bindir" >> config.mak
echo "mandir=\$(DESTDIR)$mandir" >> config.mak
echo "MAKE=$make" >> config.mak
......
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