Remove MinGW install path special-casing.
authorRamiro Polla <ramiro@lisha.ufsc.br>
Tue, 5 Dec 2006 23:39:58 +0000 (23:39 +0000)
committerDiego Biurrun <diego@biurrun.de>
Tue, 5 Dec 2006 23:39:58 +0000 (23:39 +0000)
patch by Ramiro Polla, angustia arrozcru no-ip org

Originally committed as revision 7230 to svn://svn.ffmpeg.org/ffmpeg/trunk

configure

index df230fb..a4607a4 100755 (executable)
--- a/configure
+++ b/configure
@@ -838,9 +838,9 @@ for opt do
   ;;
   --log=*) logging="$optval"
   ;;
   ;;
   --log=*) logging="$optval"
   ;;
-  --prefix=*) PREFIX="$optval"; force_prefix=yes
+  --prefix=*) PREFIX="$optval"
   ;;
   ;;
-  --libdir=*) libdir="$optval"; force_libdir=yes
+  --libdir=*) libdir="$optval"
   ;;
   --shlibdir=*) shlibdir="$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)"
     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.
 fi
 
 # Combine FFLDFLAGS and the LDFLAGS environment variable.