do not use config.guess anymore

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40676 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Stephan Witt 2012-01-26 06:16:46 +00:00
parent 7335b3193b
commit a369727378

View File

@ -226,8 +226,6 @@ LyxAppPrefix="${LyxAppDir}.app"
# if zip file is needed... remove the comment sign # if zip file is needed... remove the comment sign
#LyxAppZip="${LyxAppPrefix}.zip" #LyxAppZip="${LyxAppPrefix}.zip"
BuildSystem=`"${LyxSourceDir}/config/config.guess"`
# --------------------------------- # ---------------------------------
# DON'T MODIFY ANYTHING BELOW HERE! # DON'T MODIFY ANYTHING BELOW HERE!
# --------------------------------- # ---------------------------------
@ -328,7 +326,6 @@ if [ -d "${HunSpellSourceDir}" -a ! -f "${HunSpellInstallHdr}" ]; then
"${HunSpellSourceDir}/configure"\ "${HunSpellSourceDir}/configure"\
--prefix="${HunSpellInstallDir}"\ --prefix="${HunSpellInstallDir}"\
${HunspellConfigureOptions} ${HunspellConfigureOptions}
#--host="${HOSTSYSTEM}" ${BuildSystem:+"--build=${BuildSystem}"}
make && make install${strip} make && make install${strip}
for file in ${FILE_LIST} ; do for file in ${FILE_LIST} ; do
if [ -f "${HunSpellInstallDir}"/lib/${file} ]; then if [ -f "${HunSpellInstallDir}"/lib/${file} ]; then
@ -499,7 +496,7 @@ build_lyx() {
--prefix="${LyxAppPrefix}" --with-version-suffix="-${LyXVersionSuffix}"\ --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 && \ --enable-build-type=rel && \
make -j2 && make install${strip} make -j2 && make install${strip}
for file in ${LYX_FILE_LIST} ; do for file in ${LYX_FILE_LIST} ; do
if [ -f "${LYX_BUNDLE_PATH}/${file}" ]; then if [ -f "${LYX_BUNDLE_PATH}/${file}" ]; then