On 28.01.2016 15:42, Michael Niedermayer wrote:
> On Wed, Jan 27, 2016 at 11:52:28PM +0100, Andreas Cadhalpun wrote:
>> Makefile | 5 ++++-
>> configure | 2 +-
>> 2 files changed, 5 insertions(+), 2 deletions(-)
>> 67bd05c13361082708ccc24ee5828c4c00a443a3
>> 0001-configure-fall-back-to-using-full-path-if-src-is-a-d.patch
>> From 3dcdf81a2db324316c956553340bf42ce5d51278 Mon Sep 17 00:00:00 2001
>> From: Andreas Cadhalpun <andreas.cadhal...@googlemail.com>
>> Date: Tue, 26 Jan 2016 22:54:01 +0100
>> Subject: [PATCH] configure: fall back to using full path if src is a
>> directory
>>
>> And don't try to remove src on distclean in that case.
>>
>> Signed-off-by: Andreas Cadhalpun <andreas.cadhal...@googlemail.com>
>> ---
>> Makefile | 5 ++++-
>> configure | 2 +-
>> 2 files changed, 5 insertions(+), 2 deletions(-)
>
> LGTM
Unfortunately this does miss-detect an existing src link as directory, i.e.
when re-running configure. And then the src link is not removed on distclean.
Attached is an updated patch without this problem.
Best regards,
Andreas
>From 99ebff03e8f5e8b9cfa248a723e217a20683a543 Mon Sep 17 00:00:00 2001
From: Andreas Cadhalpun <andreas.cadhal...@googlemail.com>
Date: Tue, 26 Jan 2016 22:54:01 +0100
Subject: [PATCH] configure: fall back to using full path if src is a directory
And don't try to remove src on distclean in that case.
Signed-off-by: Andreas Cadhalpun <andreas.cadhal...@googlemail.com>
---
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 4fceaaa..f6cb854 100755
--- a/configure
+++ b/configure
@@ -4715,7 +4715,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 ([ ! -d src ] || [ -L src ]) && [ -e "$link_name/test_file" ]; then
# create link to source path
[ -e src ] && rm src
$ln_s "$source_path" src
--
2.7.0.rc3
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
