summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore4
-rw-r--r--configure.ac6
2 files changed, 7 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 0de9054739b4..a227af3d8e9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,7 @@
# if that is not the case, don't hide it here, but try to fix it
#
# The intent is that after a make distclean, .gitignore
-# should not catch anything but possibly /src
+# should not catch anything but possibly /external/tarballs
#
# where stuff are built
@@ -24,7 +24,7 @@
/workdir
# where the external downloads maybe located
-/src
+/external/tarballs
# autoconf generated stuff
/aclocal.m4
diff --git a/configure.ac b/configure.ac
index fd47321e83c2..dc7be27a5012 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4669,7 +4669,11 @@ AC_SUBST([SYSTEM_FONTCONFIG])
dnl whether to find & fetch external tarballs?
dnl ===================================================================
if test -z "$TARFILE_LOCATION"; then
- TARFILE_LOCATION="$SRC_ROOT/src"
+ if test -d "$SRC_ROOT/src" ; then
+ mv "$SRC_ROOT/src" "$SRC_ROOT/external/tarballs"
+ ln -s "$SRC_ROOT/external/tarballs" "$SRC_ROOT/src"
+ fi
+ TARFILE_LOCATION="$SRC_ROOT/external/tarballs"
fi
AC_SUBST(TARFILE_LOCATION)