Add command line option to define the location of the self made utilities

This commit is contained in:
Stephan Witt 2014-08-22 08:39:14 +02:00
parent 327da4f275
commit 8900a927a1

View File

@ -25,6 +25,8 @@ HunSpellVersion=${HunSpellVersion:-"1.3.2"}
HunSpellSource="hunspell-${HunSpellVersion}" HunSpellSource="hunspell-${HunSpellVersion}"
HunSpellLibrary="libhunspell-1.3.0.dylib" HunSpellLibrary="libhunspell-1.3.0.dylib"
LyXUtilitiesDir=${LyXUtilitiesDir:-"${LyxBuildDir}"/utilities}
unset DYLD_LIBRARY_PATH LD_LIBRARY_PATH unset DYLD_LIBRARY_PATH LD_LIBRARY_PATH
# Prerequisite: # Prerequisite:
@ -222,6 +224,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 "${1}" usage "${1}"
;; ;;
@ -262,17 +268,17 @@ DMGLocation=${DMGLocation:-"${LyxBuildDir}"}
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"
QtSourceDir=${QTSOURCEDIR:-$(dirname "${LyxSourceDir}")/${QtSourceVersion}} QtSourceDir=${QTSOURCEDIR:-$(dirname "${LyxSourceDir}")/${QtSourceVersion}}