ffmpeg | branch: master | Andreas Cadhalpun <andreas.cadhal...@googlemail.com> | Tue Jan 26 22:54:01 2016 +0100| [e740c3fb90c02802bc121e9f5a3cf58615b4cea1] | committer: Andreas Cadhalpun
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.cadhal...@googlemail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e740c3fb90c02802bc121e9f5a3cf58615b4cea1 --- Makefile | 5 ++++- configure | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e484249..7d8ae4b 100644 --- a/Makefile +++ b/Makefile @@ -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: diff --git a/configure b/configure index c415d5a..1000cb1 100755 --- a/configure +++ b/configure @@ -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 _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
