aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-19 11:34:08 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-19 11:34:50 +0100
commitb31587af4b075bd60a69330a1aa3a15201b80c27 (patch)
tree8bb6958cc5c5c42985bf1fe018e8d6dc924a4d0d
parent1f7b7d54471711b89f8a64bef1c6636b6aa08c12 (diff)
parentfa48be9b954a96d2e408ede54a105ce49d6d7c47 (diff)
downloadffmpeg-b31587af4b075bd60a69330a1aa3a15201b80c27.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: configure: Don't use symlinks for creating the out of tree makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index a19c79493d..dc9b861791 100755
--- a/configure
+++ b/configure
@@ -4761,7 +4761,7 @@ echo "License: $license"
echo "Creating config.mak, config.h, and doc/config.texi..."
-test -e Makefile || $ln_s "$source_path/Makefile" .
+test -e Makefile || echo "include $source_path/Makefile" > Makefile
enabled stripping || strip="echo skipping strip"