Commit d824aa36 authored by diego's avatar diego

Move declaration of temporary filenames after the OS-specific settings

so that things like executable suffix can be picked up.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@12573 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent d6b3b340
...@@ -863,21 +863,6 @@ ffserver_extralibs='$ldl' ...@@ -863,21 +863,6 @@ ffserver_extralibs='$ldl'
vhook_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 # default parameters
enable logging enable logging
...@@ -1303,6 +1288,22 @@ case $targetos in ...@@ -1303,6 +1288,22 @@ case $targetos in
;; ;;
esac 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 add_extralibs $osextralibs
if ! disabled logging ; then if ! disabled logging ; then
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment