mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-22 10:00:33 +00:00
use --with-libiconv-prefix; shorter version-suffix; correct file name of german dictionaries for hunspell
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35448 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
5671e2dc4d
commit
ade492b49c
@ -23,7 +23,7 @@
|
|||||||
# - hunspell: the dictionary files in the sibling directory Dictionaries/dict
|
# - hunspell: the dictionary files in the sibling directory Dictionaries/dict
|
||||||
# - mythes: the data and idx files in the sibling directory Dictionaries/thes
|
# - mythes: the data and idx files in the sibling directory Dictionaries/thes
|
||||||
|
|
||||||
LyXConfigureOptions="--enable-warnings --enable-optimization=-Os --with-included-gettext --x-includes=/usr/X11/include --x-libraries=/usr/X11/lib"
|
LyXConfigureOptions="--enable-warnings --enable-optimization=-Os --with-included-gettext --with-libiconv-prefix=/usr"
|
||||||
AspellConfigureOptions="--enable-warnings --enable-optimization=-O0 --enable-debug --disable-nls --enable-compile-in-filters --disable-pspell-compatibility"
|
AspellConfigureOptions="--enable-warnings --enable-optimization=-O0 --enable-debug --disable-nls --enable-compile-in-filters --disable-pspell-compatibility"
|
||||||
HunspellConfigureOptions="--with-warnings --disable-nls --with-included-gettext --disable-static"
|
HunspellConfigureOptions="--with-warnings --disable-nls --with-included-gettext --disable-static"
|
||||||
Qt4ConfigureOptions="-opensource -silent -shared -release -fast -no-exceptions"
|
Qt4ConfigureOptions="-opensource -silent -shared -release -fast -no-exceptions"
|
||||||
@ -194,6 +194,8 @@ HunSpellInstallHdr="${HunSpellInstallDir}/include/hunspell/hunspell.h"
|
|||||||
|
|
||||||
if [ -z "${LyXVersion}" ]; then
|
if [ -z "${LyXVersion}" ]; then
|
||||||
LyXVersion=`grep AC_INIT "${LyxSourceDir}"/configure.ac | cut -d, -f2 | tr -d " ()"`
|
LyXVersion=`grep AC_INIT "${LyxSourceDir}"/configure.ac | cut -d, -f2 | tr -d " ()"`
|
||||||
|
LyXVersionSuffix=`echo "${LyXVersion}" | cut -d. -f1-2`
|
||||||
|
LyXVersionSuffix="${LyXVersionSuffix:-${LyXVersion}}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
LyxName="LyX"
|
LyxName="LyX"
|
||||||
@ -261,7 +263,8 @@ updateDictionaries() {
|
|||||||
case "${pack}" in
|
case "${pack}" in
|
||||||
*de_DE-pack.zip)
|
*de_DE-pack.zip)
|
||||||
cd "$TMP_DIR" && unzip "${pack}" de_DE_comb.zip thes_de_DE_v2.zip
|
cd "$TMP_DIR" && unzip "${pack}" de_DE_comb.zip thes_de_DE_v2.zip
|
||||||
cd "$1"/dict && unzip -o "$TMP_DIR"/de_DE_comb.zip
|
cd "$1"/dict && unzip -o "$TMP_DIR"/de_DE_comb.zip &&\
|
||||||
|
for suffix in .aff .dic ; do mv de_DE_comb$suffix de_DE$suffix; done
|
||||||
cd "$1"/thes && unzip -o "$TMP_DIR"/thes_de_DE_v2.zip
|
cd "$1"/thes && unzip -o "$TMP_DIR"/thes_de_DE_v2.zip
|
||||||
;;
|
;;
|
||||||
*pl_PL-pack.zip)
|
*pl_PL-pack.zip)
|
||||||
@ -533,7 +536,7 @@ build_lyx() {
|
|||||||
echo CPPFLAGS="${CPPFLAGS}"
|
echo CPPFLAGS="${CPPFLAGS}"
|
||||||
echo CONFIGURE_OPTIONS="${LyXConfigureOptions}"
|
echo CONFIGURE_OPTIONS="${LyXConfigureOptions}"
|
||||||
"${LyxSourceDir}/configure"\
|
"${LyxSourceDir}/configure"\
|
||||||
--prefix="${LyxAppPrefix}" --with-version-suffix="-${LyXVersion}"\
|
--prefix="${LyxAppPrefix}" --with-version-suffix="-${LyXVersionSuffix}"\
|
||||||
${QtInstallDir:+"--with-qt4-dir=${QtInstallDir}"} \
|
${QtInstallDir:+"--with-qt4-dir=${QtInstallDir}"} \
|
||||||
${LyXConfigureOptions}\
|
${LyXConfigureOptions}\
|
||||||
--host="${HOSTSYSTEM}" --build="${BuildSystem}" --enable-build-type=rel && \
|
--host="${HOSTSYSTEM}" --build="${BuildSystem}" --enable-build-type=rel && \
|
||||||
|
Loading…
Reference in New Issue
Block a user