On 27.01.2016 12:09, Michael Niedermayer wrote:
> On Tue, Jan 26, 2016 at 11:07:43PM +0100, Andreas Cadhalpun wrote:
>> configure | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>> 1edecc11203a53b6dfa3f9816583b7bceb6b6491
>> 0001-configure-fall-back-to-using-full-path-if-src-is-a-d.patch
>> From 72b2b0c9533d96b778be4c96a418b22075f1d39a 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
>>
>> Signed-off-by: Andreas Cadhalpun <andreas.cadhal...@googlemail.com>
>
> also this fails too:
> ./configure && make distclean
>
> rm: cannot remove `src': Is a directory
> make: *** [distclean] Error 1
Indeed, if it doesn't get created, it shouldn't be removed.
Updated patch attached.
Best regards,
Andreas
>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(-)
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 7a96488..f04293a 100755
--- a/configure
+++ b/configure
@@ -4755,7 +4755,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 ] && [ -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
