diff options
| author | Måns Rullgård <mans@mansr.com> | 2006-11-08 00:02:15 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2006-11-08 00:02:15 +0000 |
| commit | 997baf014130b85828d918cb4054c17e57a8e1e5 (patch) | |
| tree | a64707d3b0e8f9450ea0b68639730fd795310a87 /configure | |
| parent | 94b594c68ae36848605766c84771674ef7b21bc9 (diff) | |
| download | ffmpeg-997baf014130b85828d918cb4054c17e57a8e1e5.tar.gz | |
allow spaces in source and build directory names
out of tree builds from a source dir with spaces is impossible
due to how make handles vpath
Originally committed as revision 6938 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -662,13 +662,15 @@ targetos="${targetos}-UNKNOWN" esac # find source path -source_path="`dirname $0`" +source_path="`dirname \"$0\"`" source_path_used="yes" if test -z "$source_path" -o "$source_path" = "." ; then - source_path=`pwd` + source_path="`pwd`" source_path_used="no" else source_path="`cd \"$source_path\"; pwd`" + echo "$source_path" | grep -q '[[:blank:]]' && + die "Out of tree builds are impossible with whitespace in source path." fi if test x"$1" = x"-h" -o x"$1" = x"--help" ; then @@ -2156,6 +2158,7 @@ if test "$source_path_used" = "yes" ; then " FILES="\ Makefile \ + common.mak \ libavformat/Makefile \ libavcodec/Makefile \ libpostproc/Makefile \ @@ -2173,8 +2176,9 @@ if test "$source_path_used" = "yes" ; then ln -sf "$source_path/$f" $f done fi -echo "SRC_PATH=$source_path" >> config.mak -echo "BUILD_ROOT=$PWD" >> config.mak +echo "SRC_PATH=\"$source_path\"" >> config.mak +echo "SRC_PATH_BARE=$source_path" >> config.mak +echo "BUILD_ROOT=\"$PWD\"" >> config.mak if test "$amr" = "yes" ; then echo "#define CONFIG_AMR 1" >> $TMPH |