diff options
author | Ramiro Polla <ramiro@lisha.ufsc.br> | 2006-12-05 23:39:58 +0000 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2006-12-05 23:39:58 +0000 |
commit | e48dc873a4cac28241f7e823310aaac5dae61cad (patch) | |
tree | 354a047ad94564eccfab6575dc14879ba113c4f8 | |
parent | a083f53c453846811f11ae650f047cdfdef18ae2 (diff) | |
download | ffmpeg-e48dc873a4cac28241f7e823310aaac5dae61cad.tar.gz |
Remove MinGW install path special-casing.
patch by Ramiro Polla, angustia arrozcru no-ip org
Originally committed as revision 7230 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rwxr-xr-x | configure | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -838,9 +838,9 @@ for opt do ;; --log=*) logging="$optval" ;; - --prefix=*) PREFIX="$optval"; force_prefix=yes + --prefix=*) PREFIX="$optval" ;; - --libdir=*) libdir="$optval"; force_libdir=yes + --libdir=*) libdir="$optval" ;; --shlibdir=*) shlibdir="$optval" ;; @@ -1066,9 +1066,6 @@ EOF SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)-$(LIBMAJOR)$(SLIBSUF)' SLIB_EXTRA_CMD="-lib /machine:i386 /def:\$(@:${SLIBSUF}=.def)" SHFLAGS="-shared -Wl,--output-def,\$(@:${SLIBSUF}=.def),--out-implib,lib\$(SLIBNAME:\$(SLIBSUF)=.dll.a)" - if test "$force_prefix" != yes; then PREFIX="$PROGRAMFILES/FFmpeg"; fi - if test "$force_libdir" != yes; then bindir='${PREFIX}'; fi - shlibdir='${PREFIX}' fi # Combine FFLDFLAGS and the LDFLAGS environment variable. |