mirror of
https://git.lyx.org/repos/lyx.git
synced 2025-01-22 16:37:28 +00:00
Try 2. It's a little upsetting to spend 73 minutes creating LyX/Win 1.3.6 only to discover that I've built the cvs tree code and not Jean-Marc's pristine, new LyX 1.3.6 tarball ;-)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@10281 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
8a989fdc68
commit
2dcc76c1ce
@ -44,7 +44,7 @@ ASPELL_DIR="${HOME}"/aspell-0.50.5
|
|||||||
# A space-separated string of directories
|
# A space-separated string of directories
|
||||||
# ASPELL_DICT_DIRS="${HOME}/aspell-en-0.50-2 ${HOME}/aspell-de-0.50-2 "
|
# ASPELL_DICT_DIRS="${HOME}/aspell-en-0.50-2 ${HOME}/aspell-de-0.50-2 "
|
||||||
ASPELL_DICT_DIRS="${HOME}/aspell-en-0.50-2"
|
ASPELL_DICT_DIRS="${HOME}/aspell-en-0.50-2"
|
||||||
LYX_DIR="${HOME}"/lyx/13x
|
LYX_DIR="../../.."
|
||||||
|
|
||||||
# Everything from here on down should be OK "as is".
|
# Everything from here on down should be OK "as is".
|
||||||
PACKAGING_DIR="$LYX_DIR/development/Win32/packaging"
|
PACKAGING_DIR="$LYX_DIR/development/Win32/packaging"
|
||||||
@ -242,13 +242,13 @@ build_lyx()
|
|||||||
# Check the line endings of configure.ac
|
# Check the line endings of configure.ac
|
||||||
# The configure script will be unable to create config.h if it
|
# The configure script will be unable to create config.h if it
|
||||||
# contains Win32-style line endings.
|
# contains Win32-style line endings.
|
||||||
rm -f ${LYX_DIR}/configure.ac
|
rm -f configure.ac
|
||||||
sed 's/
|
sed 's/
|
||||||
$//' ${LYX_DIR}/config/configure.ac > configure.ac.$$
|
$//' config/configure.ac > configure.ac.$$
|
||||||
cmp -s ${LYX_DIR}/config/configure.ac configure.ac.$$ && {
|
cmp -s config/configure.ac configure.ac.$$ && {
|
||||||
rm -f configure.ac.$$
|
rm -f configure.ac.$$
|
||||||
} || {
|
} || {
|
||||||
mv -f configure.ac.$$ ${LYX_DIR}/config/configure.ac
|
mv -f configure.ac.$$ config/configure.ac
|
||||||
echo 'configure.ac has Win32-style line endings. Corrected' >&2
|
echo 'configure.ac has Win32-style line endings. Corrected' >&2
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -300,7 +300,7 @@ install_lyx()
|
|||||||
}
|
}
|
||||||
|
|
||||||
make install || {
|
make install || {
|
||||||
echo "Failed to install $LYX_DIR" >&2
|
echo "Failed to install" >&2
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user