summaryrefslogtreecommitdiffstats
path: root/libreoffice/build/gensrc.sh
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2017-02-15 18:52:23 +0000
committer Eric Hameleers <alien@slackware.com>2017-02-15 18:52:23 +0000
commit8835b5aeec1008feb794954b464ed5061cfeef6f (patch)
treea670e53be6b9148574fb913a529bf3db21def34f /libreoffice/build/gensrc.sh
parent63ef0aebb9acf9746c8eee67e396607800cb70f8 (diff)
downloadasb-8835b5aeec1008feb794954b464ed5061cfeef6f.tar.gz
asb-8835b5aeec1008feb794954b464ed5061cfeef6f.tar.xz
libreoffice: in gensrc.sh, also take into account *.jar download files.
Diffstat (limited to 'libreoffice/build/gensrc.sh')
-rwxr-xr-xlibreoffice/build/gensrc.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/libreoffice/build/gensrc.sh b/libreoffice/build/gensrc.sh
index 1bc097e5..72e8c52a 100755
--- a/libreoffice/build/gensrc.sh
+++ b/libreoffice/build/gensrc.sh
@@ -23,7 +23,7 @@ wget --no-check-certificate -q -O - "http://cgit.freedesktop.org/libreoffice/cor
# Get the names of the tarballs we need:
eval $( wget --no-check-certificate -q -O - "http://cgit.freedesktop.org/libreoffice/core/plain/configure.ac?id=$(echo $PRGNAM-$VERSION$SUBVER)" | grep UNOWINREG_DLL= )
echo "all:" >> $TMP_DLLST
-cat $TMP_DLLST | grep -v " *#" | grep -w export | grep TARBALL | cut -f2 -d' ' | cut -f1 -d= | sed -e 's/.*/\t&=$(&)'/ >> $TMP_DLLST
+cat $TMP_DLLST | grep -v " *#" | grep -w export | grep -E '(_TARBALL|_JAR)' | cut -f2 -d' ' | cut -f1 -d= | sed -e 's/.*/\t&=$(&)'/ >> $TMP_DLLST
eval $(make HAVE_JAVA6=TRUE -f $TMP_DLLST)
# Find the download site for a given tarball:
@@ -31,7 +31,7 @@ find_url() {
cat $TMP_FETCH | sed -n "/$1/,/fetch_Download_item/s/^.*fetch_Download_item[^,]*,\([^,]*\),.*$/\1/p"
}
-for BALL in UNOWINREG_DLL $( cat $TMP_DLLST | grep -v " *#" | grep -w export | grep TARBALL | cut -f2 -d' ' | cut -f1 -d= ); do
+for BALL in UNOWINREG_DLL $( cat $TMP_DLLST | grep -v " *#" | grep -w export | grep -E '(_TARBALL|_JAR)' | cut -f2 -d' ' | cut -f1 -d= ); do
SRCURL=$(find_url $BALL)
FILE=$(eval "echo \$$BALL")