On 30.01.2016 17:36, Derek Buitenhuis wrote:
> On 1/30/2016 12:11 PM, Michael Niedermayer wrote:
>> patch should be ok
>
> Related to this:
>
> [16:25] <@Daemon404> that src/ dir really screws up my grepping if i dont
> distclean first
> [16:25] <@Daemon404> i get all my results twice
> [16:25] <@Daemon404> unless i build out of tree
> [16:25] <@Daemon404> -_-
> [16:34] <@Daemon404> if i cant use standard unix utilities, that's sad
Since the src link isn't used by in-tree builds anyway, it doesn't have
to be created in that case, too.
Updated patch attached.
Best regards,
Andreas
>From 411519bc088118251359ea5a6aa995ea6c8fd660 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
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>
---
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
--
2.7.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
