Small bug in reLyX wrapper generation.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@449 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2000-01-26 13:16:41 +00:00
parent 30fc93ab48
commit de59e7e114
3 changed files with 11 additions and 1 deletions

View File

@ -1,5 +1,11 @@
2000-01-26 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr> 2000-01-26 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* lib/reLyX/reLyX.in: use variable @LYX_DIR@ as built-in data
directory.
* lib/reLyX/configure.in (LYX_DIR): re-introduce this variable
that I removed earlier... It is really needed.
* lib/examples/multicol.lyx: new file, splitted from Extended.lyx. * lib/examples/multicol.lyx: new file, splitted from Extended.lyx.
2000-01-25 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr> 2000-01-25 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>

View File

@ -19,6 +19,10 @@ AC_PREFIX_PROGRAM(reLyX)
test "x$prefix" = xNONE && prefix=$ac_default_prefix test "x$prefix" = xNONE && prefix=$ac_default_prefix
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
# we need to expand ${datadir} to put it into the reLyX wrapper.
LYX_DIR=`eval "echo \`eval \"echo ${datadir}/${PACKAGE}\"\`"`
AC_SUBST(LYX_DIR)
dnl Checks for programs. dnl Checks for programs.
AC_PROG_INSTALL AC_PROG_INSTALL
RELYX_CHECK_PERL RELYX_CHECK_PERL

View File

@ -18,7 +18,7 @@ my $mainscript = "reLyXmain.pl";
# Do this in a BEGIN block so it's done before the 'use lib' below # Do this in a BEGIN block so it's done before the 'use lib' below
BEGIN{ BEGIN{
# This points to LyX library dir, e.g. /usr/local/share/lyx # This points to LyX library dir, e.g. /usr/local/share/lyx
$lyxdir = "@pkgdatadir@"; $lyxdir = "@LYX_DIR@";
# This is just "." if you compiled from the source directory # This is just "." if you compiled from the source directory
my $srcdir = "@srcdir@"; my $srcdir = "@srcdir@";
# This is the name of the program, usually just "lyx" # This is the name of the program, usually just "lyx"