backport of --with-util-dir option

This commit is contained in:
Stephan Witt 2015-01-04 14:39:11 +01:00
parent f067babf6e
commit e0840f28b7

View File

@ -212,6 +212,10 @@ while [ $# -gt 0 ]; do
LyxBuildDir=$(echo ${1}|cut -d= -f2) LyxBuildDir=$(echo ${1}|cut -d= -f2)
shift shift
;; ;;
--with-util-dir=*)
LyXUtilitiesDir=$(echo ${1}|cut -d= -f2)
shift
;;
--help|--help=*) --help|--help=*)
usage usage
;; ;;
@ -251,19 +255,21 @@ aspellstrip=
LyxBuildDir=${LyxBuildDir:-$(dirname "${LyxSourceDir}")/lyx-build} LyxBuildDir=${LyxBuildDir:-$(dirname "${LyxSourceDir}")/lyx-build}
DMGLocation=${DMGLocation:-"${LyxBuildDir}"} DMGLocation=${DMGLocation:-"${LyxBuildDir}"}
LyXUtilitiesDir=${LyXUtilitiesDir:-"${LyxBuildDir}"/utilities}
GettextSourceDir=${GETTEXTDIR:-$(dirname "${LyxSourceDir}")/${GettextSource}} GettextSourceDir=${GETTEXTDIR:-$(dirname "${LyxSourceDir}")/${GettextSource}}
GettextBuildDir="${LyxBuildDir}"/"${GettextSource}" GettextBuildDir="${LyxBuildDir}"/"${GettextSource}"
GettextInstallDir=${GettextInstallDir:-"${LyxBuildDir}"/utilities} GettextInstallDir=${GettextInstallDir:-"${LyXUtilitiesDir}"}
GettextInstallHdr="${GettextInstallDir}/include/libintl.h" GettextInstallHdr="${GettextInstallDir}/include/libintl.h"
ASpellSourceDir=${ASPELLDIR:-$(dirname "${LyxSourceDir}")/${ASpellSource}} ASpellSourceDir=${ASPELLDIR:-$(dirname "${LyxSourceDir}")/${ASpellSource}}
ASpellBuildDir="${ASpellSourceDir}" ASpellBuildDir="${ASpellSourceDir}"
ASpellInstallDir=${ASpellInstallDir:-"${LyxBuildDir}"/utilities} ASpellInstallDir=${ASpellInstallDir:-"${LyXUtilitiesDir}"}
ASpellInstallHdr="${ASpellInstallDir}/include/aspell.h" ASpellInstallHdr="${ASpellInstallDir}/include/aspell.h"
HunSpellSourceDir=${HUNSPELLDIR:-$(dirname "${LyxSourceDir}")/${HunSpellSource}} HunSpellSourceDir=${HUNSPELLDIR:-$(dirname "${LyxSourceDir}")/${HunSpellSource}}
HunSpellBuildDir="${HunSpellSourceDir}" HunSpellBuildDir="${HunSpellSourceDir}"
HunSpellInstallDir=${HunSpellInstallDir:-"${LyxBuildDir}"/utilities} HunSpellInstallDir=${HunSpellInstallDir:-"${LyXUtilitiesDir}"}
HunSpellInstallHdr="${HunSpellInstallDir}/include/hunspell/hunspell.h" HunSpellInstallHdr="${HunSpellInstallDir}/include/hunspell/hunspell.h"
Qt4SourceDir=${QT4SOURCEDIR:-$(dirname "${LyxSourceDir}")/${Qt4SourceVersion}} Qt4SourceDir=${QT4SOURCEDIR:-$(dirname "${LyxSourceDir}")/${Qt4SourceVersion}}