anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix compatibility to autoconf 2.60

Browse Source 
* 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:
Enrico Forestieri 2006-11-24 01:14:26 +00:00
parent 3770e1a342
commit 95f9c18fac
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
autogen.sh
View File

@ -38,12 +38,12 @@ test "$autoversion" != "" && {
} }
case $autoversion in case $autoversion in
*' '2.5[2-9]) *' '2.5[2-9]|*' '2.60|*' '2.60a)
EXTRA_ACINCLUDE_FILES="lyxinclude25x.m4" EXTRA_ACINCLUDE_FILES="lyxinclude25x.m4"
;; ;;
*) *)
echo "This autoconf version is not supported by LyX." 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 exit 1
;; ;;
esac esac

2
configure.ac
View File

@ -285,7 +285,7 @@ AC_FUNC_SELECT_ARGTYPES
### Some information on what just happened ### Some information on what just happened
real_bindir=`eval "echo \`eval \"echo ${bindir}\"\`"` 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\"\`"` real_localedir=`eval "echo \`eval \"echo ${datadir}/locale\"\`"`
VERSION_INFO="Configuration\n\ VERSION_INFO="Configuration\n\
Host type: ${host}\n\ Host type: ${host}\n\

1
intl/Makefile.in
View File

@ -31,6 +31,7 @@ exec_prefix = @exec_prefix@
transform = @program_transform_name@ transform = @program_transform_name@
libdir = @libdir@ libdir = @libdir@
includedir = @includedir@ includedir = @includedir@
datarootdir = @datarootdir@
datadir = @datadir@ datadir = @datadir@
localedir = $(datadir)/locale localedir = $(datadir)/locale
gettextsrcdir = $(datadir)/gettext/intl gettextsrcdir = $(datadir)/gettext/intl

1
po/Makefile.in.in
View File

@ -22,6 +22,7 @@ VPATH = @srcdir@
prefix = @prefix@ prefix = @prefix@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
datarootdir = @datarootdir@
datadir = @datadir@ datadir = @datadir@
localedir = $(datadir)/locale localedir = $(datadir)/locale
gettextsrcdir = $(datadir)/gettext/po gettextsrcdir = $(datadir)/gettext/po