From 43865cf092b2e623346fe0d3cbd1a175b9663408 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Thu, 13 Jul 2006 21:17:20 +0000 Subject: [PATCH] Simplify the setting of some defaults. Originally committed as revision 5730 to svn://svn.ffmpeg.org/ffmpeg/trunk --- configure | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/configure b/configure index e147b835a9..64be2bf24a 100755 --- a/configure +++ b/configure @@ -327,10 +327,10 @@ TMPH="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.h" logging="yes" logfile="config.err" prefix="/usr/local" -libdir="" -incdir="" -mandir="" -bindir="" +libdir="${prefix}/lib" +incdir="${prefix}/include/ffmpeg" +mandir="${prefix}/man" +bindir="${prefix}/bin" cross_prefix="" cross_compile="no" cc="gcc" @@ -1473,22 +1473,6 @@ if test "$gprof" = "yes" ; then LDFLAGS="$LDFLAGS -p" fi -if test x"$bindir" = x""; then - bindir="${prefix}/bin" -fi - -if test x"$libdir" = x""; then - libdir="${prefix}/lib" -fi - -if test x"$incdir" = x""; then - incdir="${prefix}/include/ffmpeg" -fi - -if test x"$mandir" = x""; then - mandir="${prefix}/man" -fi - echo "install prefix $prefix" echo "source path $source_path" echo "C compiler $cc"