Allow to preinstall some dictionaries even with OOo-3.

* bin/ooinstall, bin/install-dictionaries: allow to preinstall some
dictionaries even with OOo-3.0; they are put into
$OOINSTDIR/basis$VERSION/share/dictionaries;
we use it on SLED10 for hyphen and thesaurus dictionaries
* bin/install-dict.in, bin/package-ooo, bin/Makefile.am:
bin the obsolete install-dict script; dictionary.lst is not longer
needed

* ooo-build/distro-configs/SUSE-10.1.conf.in: configure the
dictionaries for SLED10; add
--with-external-dict-dir=/usr/share/myspell
--with-external-hyph-dir=@libdir@/@OOOINSTALLDIRNAME@/basis@OOO_VERSION@/share/dictionaries
--with-external-thes-dir=@libdir@/@OOOINSTALLDIRNAME@/basis@OOO_VERSION@/share/dictionaries 
--with-system-dicts 

1 files changed, 12 insertions, 11 deletions

diff --git a/bin/install-dictionaries b/bin/install-dictionaries
index 3c58afbb8..1e7ff4d1f 100755
--- a/bin/install-dictionaries
+++ b/bin/install-dictionaries
@@ -8,12 +8,7 @@
 if test "z$1" != "z"; then
     DICTDIR=$1;
 else
-    DICTDIR=$OOINSTDIR/share/dict/ooo
-fi
-
-if (! test -d $DICTDIR); then
-    echo "Cannot find $DICTDIR; make sure you installed OOo first"
-    exit 1;
+    DICTDIR=$OOINSTDIR/basis$VERSION/share/dictionaries
 fi
 
 DICTDIRBASE=`echo $DICTDIR | sed "s|^$OODESTDIR||"`
@@ -136,7 +131,7 @@ DICTS="hyph_bg_BG
 
 install_dic()
 {
-    test -f $1/$2 && mv $1/$2 $DICTDIR/ && echo "$DICTDIRBASE/$2" >>$DICTFILELIST
+    test -f $1/$2 && mv $1/$2 $DICTDIR/ && echo "$DICTDIRBASE/$2" >>$DICTFILELIST && dic_installed=true 
 }
 
 install_doc()
@@ -161,15 +156,17 @@ else
     DICTFILELIST=/dev/null
 fi
 
+dic_installed=false
 doc_installed=false
 for DICT in $DICTS ; do
   if test -f $SRCDIR/$DICT.tar.bz2 ; then
     echo "Unpacking $DICT dictionary..."
+    mkdir -m 755 -p $DICTDIR
     mkdir -m 755 -p $DOCDIR/dictionaries
     TMPDIR=`mktemp -d /tmp/ooo-build.dict.XXXXXX`
     tar -xjf $SRCDIR/$DICT.tar.bz2 -C $TMPDIR || exit 1;
     chmod 644 $TMPDIR/*.* || exit 1;
-    
+
     # dictionaries
     DICTNAME=$(echo $DICT | sed s/thes/th/)
     install_dic $TMPDIR $DICTNAME.dic
@@ -193,11 +190,15 @@ for DICT in $DICTS ; do
   fi
 done
 
+if $dic_installed ; then
+    echo "%dir $DICTDIRBASE"	      		>>$DICTFILELIST
+fi
+
 if $doc_installed ; then
     echo "%dir $DOCDIRBASE"	      		>>$DICTFILELIST
     echo "%dir $DOCDIRBASE/dictionaries" 	>>$DICTFILELIST
 fi
 
-echo "Creating dictionary.lst..."
-$TOOLSDIR/bin/install-dict.in $DICTDIR
-test -f $DICTDIR/dictionary.lst && echo "$DICTDIRBASE/dictionary.lst" >>$DICTFILELIST
+#echo "Creating dictionary.lst..."
+#$TOOLSDIR/bin/install-dict.in $DICTDIR
+#test -f $DICTDIR/dictionary.lst && echo "$DICTDIRBASE/dictionary.lst" >>$DICTFILELIST