[SCM] libav/experimental: Don't hardcode .dll in the MinGW section, use $SLIBSUF instead.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:49:43 UTC 2013


The following commit has been merged in the experimental branch:
commit dfeb80a5a97a9a6bbc48d7c7899308fa29714c8b
Author: Diego Biurrun <diego at biurrun.de>
Date:   Thu Aug 3 16:34:22 2006 +0000

    Don't hardcode .dll in the MinGW section, use $SLIBSUF instead.
    
    Originally committed as revision 5922 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/configure b/configure
index 30ce3d5..e35561a 100755
--- a/configure
+++ b/configure
@@ -878,13 +878,13 @@ EOF
     if test "$mingwce" = "yes"; then
         protocols="no"
     fi
-    FFLDFLAGS='-Wl,--output-def,$(@:.dll=.def),--out-implib,lib$(SLIBNAME:$(SLIBSUF)=.dll.a)'
     SLIBPREF=""
     SLIBSUF=".dll"
     EXESUF=".exe"
     SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)-$(LIBVERSION)$(SLIBSUF)'
     SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)-$(LIBMAJOR)$(SLIBSUF)'
-    SLIB_EXTRA_CMD='-lib /machine:i386 /def:$(@:.dll=.def)'
+    SLIB_EXTRA_CMD="-lib /machine:i386 /def:\$(@:${SLIBSUF}=.def)"
+    FFLDFLAGS="-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
 fi

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list