Commit 4d37d8b0 authored by diego's avatar diego

Use a different filename that ends in .sh for temporary shell scripts.

Apparently some Windows command interpreters have trouble executing
shell scripts with an .exe suffix.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@12650 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 6bf50717
...@@ -216,7 +216,7 @@ Include the log file "$logfile" produced by configure as this will help ...@@ -216,7 +216,7 @@ Include the log file "$logfile" produced by configure as this will help
solving the problem. solving the problem.
EOF EOF
fi fi
rm -f $TMPC $TMPO $TMPE $TMPS $TMPH rm -f $TMPC $TMPO $TMPE $TMPS $TMPH $TMPSH
exit 1 exit 1
} }
...@@ -1210,6 +1210,7 @@ TMPO="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.o" ...@@ -1210,6 +1210,7 @@ TMPO="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.o"
TMPE="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}${EXESUF}" TMPE="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}${EXESUF}"
TMPS="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.S" TMPS="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.S"
TMPH="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.h" TMPH="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.h"
TMPSH="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.sh"
add_extralibs $osextralibs add_extralibs $osextralibs
...@@ -1442,11 +1443,11 @@ if ! gnu_make $make; then ...@@ -1442,11 +1443,11 @@ if ! gnu_make $make; then
fi fi
# make sure we can execute files in $TMPDIR # make sure we can execute files in $TMPDIR
cat >$TMPE 2>>$logfile <<EOF cat >$TMPSH 2>>$logfile <<EOF
#! /bin/sh #! /bin/sh
EOF EOF
chmod +x $TMPE >>$logfile 2>&1 chmod +x $TMPSH >>$logfile 2>&1
if ! $TMPE >>$logfile 2>&1; then if ! $TMPSH >>$logfile 2>&1; then
cat <<EOF cat <<EOF
Unable to create and execute files in $TMPDIR1. Set the TMPDIR environment Unable to create and execute files in $TMPDIR1. Set the TMPDIR environment
variable to another directory and make sure that $TMPDIR1 is not mounted variable to another directory and make sure that $TMPDIR1 is not mounted
...@@ -1454,7 +1455,7 @@ noexec. ...@@ -1454,7 +1455,7 @@ noexec.
EOF EOF
die "Sanity test failed." die "Sanity test failed."
fi fi
rm $TMPE rm $TMPSH
# compiler sanity check # compiler sanity check
check_exec <<EOF check_exec <<EOF
...@@ -2067,7 +2068,7 @@ cmp -s $TMPH config.h && ...@@ -2067,7 +2068,7 @@ cmp -s $TMPH config.h &&
echo "config.h is unchanged" || echo "config.h is unchanged" ||
mv -f $TMPH config.h mv -f $TMPH config.h
rm -f $TMPO $TMPC $TMPE $TMPS $TMPH rm -f $TMPO $TMPC $TMPE $TMPS $TMPH $TMPSH
# build tree in object directory if source path is different from current one # build tree in object directory if source path is different from current one
if enabled source_path_used; then if enabled source_path_used; 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