Small bug in reLyX wrapper generation.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@449 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index dc0d1547423d7fec9fef8356935a8cf66dd3b3b0..9cb6d5304736406a3b3ded39e2f7c6b123535eee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 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. 
 
 2000-01-25  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>

diff --git a/lib/reLyX/configure.in b/lib/reLyX/configure.in
index 53ab8f750afd9b2265273a0a927f3102e00fb671..21ddf267e5bd0323206cdc5f6f6f053ecd448a5c 100644 (file)
--- 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 4f1368c6914995ddfe462692f9eb87cd7bf1ea9d..87235a18a82ab464f5a37e17715e130c26fab042 100644 (file)
--- 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"