strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Save downloaded tarballs under external/tarballs/

Browse source 
The choice of src/ as a place to save those tarballs was unfortunate,
since it is used everywhere else for own source code. After moving all
external modules to external/, it makes sense to put the tarballs there
too and, while at it, use a more appropriate name.

If src exist as a directory, we move it to external/tarballs and leave
a link behind for backward compat for people switching from after to
before the change in the git repo.

Change-Id: I045c4470945f5fadf7760855833ef58e6594ec80
Reviewed-on: https://gerrit.libreoffice.org/6597
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
This commit is contained in:
Norbert Thiebaud 2013-11-15 10:43:20 -06:00 committed by Björn Michaelsen
parent 3e8fe4d8e1
commit 09e2349c51
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored
View file

@ -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

6
configure.ac
View file

@ -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)