mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
Fix compatibility to autoconf 2.60
* configure.ac: Fix up expansion of ${prefix} in ${pkgdatadir}. * autogen.sh: Allow using autoconf 2.60 and 2.60a. * intl/Makefile.in: * po/Makefile.in.in: Add datarootdir definition. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16021 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
3770e1a342
commit
95f9c18fac
@ -38,12 +38,12 @@ test "$autoversion" != "" && {
|
||||
}
|
||||
|
||||
case $autoversion in
|
||||
*' '2.5[2-9])
|
||||
*' '2.5[2-9]|*' '2.60|*' '2.60a)
|
||||
EXTRA_ACINCLUDE_FILES="lyxinclude25x.m4"
|
||||
;;
|
||||
*)
|
||||
echo "This autoconf version is not supported by LyX."
|
||||
echo "LyX only supports autoconf 2.5[2-9]."
|
||||
echo "LyX only supports autoconf 2.5[2-9]-2.60[a]."
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
@ -285,7 +285,7 @@ AC_FUNC_SELECT_ARGTYPES
|
||||
|
||||
### Some information on what just happened
|
||||
real_bindir=`eval "echo \`eval \"echo ${bindir}\"\`"`
|
||||
real_pkgdatadir=`eval "echo \`eval \"echo ${pkgdatadir}\"\`"`
|
||||
real_pkgdatadir=`eval "echo \`eval \"echo \\\`eval \\\"echo ${pkgdatadir}\\\"\\\`\"\`"`
|
||||
real_localedir=`eval "echo \`eval \"echo ${datadir}/locale\"\`"`
|
||||
VERSION_INFO="Configuration\n\
|
||||
Host type: ${host}\n\
|
||||
|
@ -31,6 +31,7 @@ exec_prefix = @exec_prefix@
|
||||
transform = @program_transform_name@
|
||||
libdir = @libdir@
|
||||
includedir = @includedir@
|
||||
datarootdir = @datarootdir@
|
||||
datadir = @datadir@
|
||||
localedir = $(datadir)/locale
|
||||
gettextsrcdir = $(datadir)/gettext/intl
|
||||
|
@ -22,6 +22,7 @@ VPATH = @srcdir@
|
||||
|
||||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
datarootdir = @datarootdir@
|
||||
datadir = @datadir@
|
||||
localedir = $(datadir)/locale
|
||||
gettextsrcdir = $(datadir)/gettext/po
|
||||
|
Loading…
Reference in New Issue
Block a user