From de59e7e1140aca41c23e0c6e54fafb5e8c0718e5 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Wed, 26 Jan 2000 13:16:41 +0000 Subject: [PATCH] Small bug in reLyX wrapper generation. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@449 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 6 ++++++ lib/reLyX/configure.in | 4 ++++ lib/reLyX/reLyX.in | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index dc0d154742..9cb6d53047 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2000-01-26 Jean-Marc Lasgouttes + * 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. 2000-01-25 Jean-Marc Lasgouttes diff --git a/lib/reLyX/configure.in b/lib/reLyX/configure.in index 53ab8f750a..21ddf267e5 100644 --- a/lib/reLyX/configure.in +++ b/lib/reLyX/configure.in @@ -19,6 +19,10 @@ AC_PREFIX_PROGRAM(reLyX) test "x$prefix" = xNONE && prefix=$ac_default_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. AC_PROG_INSTALL RELYX_CHECK_PERL diff --git a/lib/reLyX/reLyX.in b/lib/reLyX/reLyX.in index 4f1368c691..87235a18a8 100644 --- a/lib/reLyX/reLyX.in +++ b/lib/reLyX/reLyX.in @@ -18,7 +18,7 @@ my $mainscript = "reLyXmain.pl"; # Do this in a BEGIN block so it's done before the 'use lib' below BEGIN{ # 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 my $srcdir = "@srcdir@"; # This is the name of the program, usually just "lyx" -- 2.39.2