Author: switt
Date: Thu Jan 26 16:30:58 2012
New Revision: 40679
URL: http://www.lyx.org/trac/changeset/40679
Log:
do not use config.guess anymore
Modified:
lyx-devel/branches/BRANCH_2_0_X/development/LyX-Mac-binary-release.sh
lyx-devel/branches/BRANCH_2_0_X/status.20x
Modified: lyx-devel/branches/BRANCH_2_0_X/development/LyX-Mac-binary-release.sh
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/development/LyX-Mac-binary-release.sh
Thu Jan 26 12:15:44 2012 (r40678)
+++ lyx-devel/branches/BRANCH_2_0_X/development/LyX-Mac-binary-release.sh
Thu Jan 26 16:30:58 2012 (r40679)
@@ -216,8 +216,6 @@
# if zip file is needed... remove the comment sign
#LyxAppZip="${LyxAppPrefix}.zip"
-BuildSystem=`"${LyxSourceDir}/config/config.guess"`
-
# ---------------------------------
# DON'T MODIFY ANYTHING BELOW HERE!
# ---------------------------------
@@ -318,7 +316,6 @@
"${HunSpellSourceDir}/configure"\
--prefix="${HunSpellInstallDir}"\
${HunspellConfigureOptions}
- #--host="${HOSTSYSTEM}"
${BuildSystem:+"--build=${BuildSystem}"}
make && make install${strip}
for file in ${FILE_LIST} ; do
if [ -f "${HunSpellInstallDir}"/lib/${file} ]; then
@@ -383,7 +380,6 @@
CXXFLAGS=-g "${ASpellSourceDir}/configure"\
--prefix="${ASpellInstallDir}"\
${AspellConfigureOptions}
- #--host="${HOSTSYSTEM}"
${BuildSystem:+"--build=${BuildSystem}"}
make && make install${aspellstrip}
for file in ${FILE_LIST} ; do
if [ -f "${ASpellInstallDir}"/lib/${file} ]; then
@@ -492,7 +488,7 @@
--prefix="${LyxAppPrefix}"
--with-version-suffix="-${LyXVersionSuffix}"\
${QtInstallDir:+"--with-qt4-dir=${QtInstallDir}"} \
${LyXConfigureOptions}\
- --host="${HOSTSYSTEM}" --build="${BuildSystem}"
--enable-build-type=rel && \
+ --enable-build-type=rel && \
make -j2 && make install${strip}
for file in ${LYX_FILE_LIST} ; do
if [ -f "${LYX_BUNDLE_PATH}/${file}" ]; then
Modified: lyx-devel/branches/BRANCH_2_0_X/status.20x
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/status.20x Thu Jan 26 12:15:44 2012
(r40678)
+++ lyx-devel/branches/BRANCH_2_0_X/status.20x Thu Jan 26 16:30:58 2012
(r40679)
@@ -235,3 +235,5 @@
- Fix installation of python files (bug 6080, bug 7990).
+- When building LyX package on Mac don't call configure with --build anymore.
+ It's guessed by configure anyway.
