From e0840f28b73aa16b5bd0a2c8aa9bf84198d19287 Mon Sep 17 00:00:00 2001 From: Stephan Witt Date: Sun, 4 Jan 2015 14:39:11 +0100 Subject: [PATCH] backport of --with-util-dir option --- development/LyX-Mac-binary-release.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/development/LyX-Mac-binary-release.sh b/development/LyX-Mac-binary-release.sh index 53ee0eba94..5df1107a8f 100644 --- a/development/LyX-Mac-binary-release.sh +++ b/development/LyX-Mac-binary-release.sh @@ -212,6 +212,10 @@ while [ $# -gt 0 ]; do LyxBuildDir=$(echo ${1}|cut -d= -f2) shift ;; + --with-util-dir=*) + LyXUtilitiesDir=$(echo ${1}|cut -d= -f2) + shift + ;; --help|--help=*) usage ;; @@ -251,19 +255,21 @@ aspellstrip= LyxBuildDir=${LyxBuildDir:-$(dirname "${LyxSourceDir}")/lyx-build} DMGLocation=${DMGLocation:-"${LyxBuildDir}"} +LyXUtilitiesDir=${LyXUtilitiesDir:-"${LyxBuildDir}"/utilities} + GettextSourceDir=${GETTEXTDIR:-$(dirname "${LyxSourceDir}")/${GettextSource}} GettextBuildDir="${LyxBuildDir}"/"${GettextSource}" -GettextInstallDir=${GettextInstallDir:-"${LyxBuildDir}"/utilities} +GettextInstallDir=${GettextInstallDir:-"${LyXUtilitiesDir}"} GettextInstallHdr="${GettextInstallDir}/include/libintl.h" ASpellSourceDir=${ASPELLDIR:-$(dirname "${LyxSourceDir}")/${ASpellSource}} ASpellBuildDir="${ASpellSourceDir}" -ASpellInstallDir=${ASpellInstallDir:-"${LyxBuildDir}"/utilities} +ASpellInstallDir=${ASpellInstallDir:-"${LyXUtilitiesDir}"} ASpellInstallHdr="${ASpellInstallDir}/include/aspell.h" HunSpellSourceDir=${HUNSPELLDIR:-$(dirname "${LyxSourceDir}")/${HunSpellSource}} HunSpellBuildDir="${HunSpellSourceDir}" -HunSpellInstallDir=${HunSpellInstallDir:-"${LyxBuildDir}"/utilities} +HunSpellInstallDir=${HunSpellInstallDir:-"${LyXUtilitiesDir}"} HunSpellInstallHdr="${HunSpellInstallDir}/include/hunspell/hunspell.h" Qt4SourceDir=${QT4SOURCEDIR:-$(dirname "${LyxSourceDir}")/${Qt4SourceVersion}} -- 2.39.5