diff options
| author | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2016-01-26 22:54:01 +0100 |
|---|---|---|
| committer | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2016-02-06 15:30:25 +0100 |
| commit | e740c3fb90c02802bc121e9f5a3cf58615b4cea1 (patch) | |
| tree | 3788c850003446a364369c57e89abd9600d63246 | |
| parent | 956fed377b4c53dde5005e1def8e999e24cae70e (diff) | |
| download | ffmpeg-e740c3fb90c02802bc121e9f5a3cf58615b4cea1.tar.gz | |
configure: fall back to using full path if src is a directory
Or when building in-tree.
Also don't try to remove src on distclean in these cases.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
| -rw-r--r-- | Makefile | 5 | ||||
| -rwxr-xr-x | configure | 2 |
2 files changed, 5 insertions, 2 deletions
@@ -181,7 +181,10 @@ clean:: distclean:: $(RM) $(DISTCLEANSUFFIXES) - $(RM) config.* .config libavutil/avconfig.h .version avversion.h version.h libavutil/ffversion.h libavcodec/codec_names.h src + $(RM) config.* .config libavutil/avconfig.h .version avversion.h version.h libavutil/ffversion.h libavcodec/codec_names.h +ifeq ($(SRC_LINK),src) + $(RM) src +endif $(RM) -rf doc/examples/pc-uninstalled config: @@ -4710,7 +4710,7 @@ link_name=$(mktemp -u $TMPDIR/name_XXXXXXXX) mkdir "$link_dest" $ln_s "$link_dest" "$link_name" touch "$link_dest/test_file" -if [ -e "$link_name/test_file" ]; then +if [ "$source_path" != "." ] && ([ ! -d src ] || [ -L src ]) && [ -e "$link_name/test_file" ]; then # create link to source path [ -e src ] && rm src $ln_s "$source_path" src |