anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 10:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

do not use config.guess anymore

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40679 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Stephan Witt 2012-01-26 15:30:58 +00:00
parent 0b45aa536f
commit 53ebb66d2a
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
development/LyX-Mac-binary-release.sh
View File

@ -216,8 +216,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!
# --------------------------------- # ---------------------------------
@ -318,7 +316,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
@ -383,7 +380,6 @@ if [ -d "${ASpellSourceDir}" -a ! -f "${ASpellInstallHdr}" -a "yes" = "${aspell_
CXXFLAGS=-g "${ASpellSourceDir}/configure"\ CXXFLAGS=-g "${ASpellSourceDir}/configure"\
--prefix="${ASpellInstallDir}"\ --prefix="${ASpellInstallDir}"\
${AspellConfigureOptions} ${AspellConfigureOptions}
#--host="${HOSTSYSTEM}" ${BuildSystem:+"--build=${BuildSystem}"}
make && make install${aspellstrip} make && make install${aspellstrip}
for file in ${FILE_LIST} ; do for file in ${FILE_LIST} ; do
if [ -f "${ASpellInstallDir}"/lib/${file} ]; then if [ -f "${ASpellInstallDir}"/lib/${file} ]; then
@ -492,7 +488,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

2
status.20x
View File

@ -235,3 +235,5 @@ What's new
- Fix installation of python files (bug 6080, bug 7990). - 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.