[SCM] libav/experimental: Move declaration of temporary filenames after the OS-specific settings so that things like executable suffix can be picked up.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:17:40 UTC 2013


The following commit has been merged in the experimental branch:
commit 0f53b192285264aacd2128366bd42b2c6fff7349
Author: Diego Biurrun <diego at biurrun.de>
Date:   Tue Mar 25 09:22:03 2008 +0000

    Move declaration of temporary filenames after the OS-specific settings
    so that things like executable suffix can be picked up.
    
    Originally committed as revision 12573 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/configure b/configure
index 45e5b6d..86f9df5 100755
--- a/configure
+++ b/configure
@@ -863,21 +863,6 @@ ffserver_extralibs='$ldl'
 vhook_extralibs='$ldl'
 
 
-# set temporary file name
-if test ! -z "$TMPDIR" ; then
-    TMPDIR1="${TMPDIR}"
-elif test ! -z "$TEMPDIR" ; then
-    TMPDIR1="${TEMPDIR}"
-else
-    TMPDIR1="/tmp"
-fi
-
-TMPC="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.c"
-TMPO="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.o"
-TMPE="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}"
-TMPS="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.S"
-TMPH="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.h"
-
 # default parameters
 
 enable logging
@@ -1303,6 +1288,22 @@ case $targetos in
         ;;
 esac
 
+# set temporary file name
+if test ! -z "$TMPDIR" ; then
+    TMPDIR1="${TMPDIR}"
+elif test ! -z "$TEMPDIR" ; then
+    TMPDIR1="${TEMPDIR}"
+else
+    TMPDIR1="/tmp"
+fi
+
+TMPC="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.c"
+TMPO="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.o"
+TMPE="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}"
+TMPS="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.S"
+TMPH="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.h"
+
+
 add_extralibs $osextralibs
 
 if ! disabled logging ; then

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list