Updated to 4.4.0.3. Makes proper use of make functionality

1 files changed, 6 insertions, 4 deletions

diff --git a/libreoffice/build/gensrc.sh b/libreoffice/build/gensrc.sh
index ca9eef82..e365a8e5 100755
--- a/libreoffice/build/gensrc.sh
+++ b/libreoffice/build/gensrc.sh
@@ -2,9 +2,9 @@
 
 PRGNAM=libreoffice
 VERSION=4.4.0
-SUBVER=.1
+SUBVER=.3
 
-STARTINDEX=8
+STARTINDEX=6
 
 III=$STARTINDEX
 
@@ -22,14 +22,16 @@ wget -q -O - "http://cgit.freedesktop.org/libreoffice/core/plain/Makefile.fetch?
 
 # Get the names of the tarballs we need:
 eval $( wget -q -O - "http://cgit.freedesktop.org/libreoffice/core/plain/configure.ac?id=$(echo $PRGNAM-$VERSION$SUBVER)" | grep UNOWINREG_DLL= )
-eval $( cat $TMP_DLLST | grep "^export " | grep _TARBALL | grep -v "filter " | grep -v MOZ_ZIP | sed -e 's/^export //' -e 's/ := /=/' )
+echo "all:"  >> $TMP_DLLST
+cat $TMP_DLLST | grep -v " *#" | grep -w export | grep TARBALL | cut -f2 -d' ' | sed -e 's/.*/\t&=$(&)'/  >> $TMP_DLLST
+eval $(make HAVE_JAVA6=TRUE -f $TMP_DLLST)
 
 # Find the download site for a given tarball:
 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 "^export " | grep _TARBALL | grep -v "filter " | grep -v MOZ_ZIP | sed -e 's/^export //' -e 's/ := .*$//' ); do
+for BALL in UNOWINREG_DLL $( cat $TMP_DLLST | grep -v " *#" | grep -w export | grep TARBALL | cut -f2 -d' ' ); do
 
   SRCURL=$(find_url $BALL)
   FILE=$(eval "echo \$$BALL")