Treat \\tablenewline as \\newline inside tables

[lyx.git] / lib / reLyX / reLyX.in

diff --git a/lib/reLyX/reLyX.in b/lib/reLyX/reLyX.in
index 2a4773f22582ecf689489083ac00c4a7b6c4a9dc..846188a4a2f9dcd7b5685be9dc010899b8cf15bd 100644 (file)
--- a/lib/reLyX/reLyX.in
+++ b/lib/reLyX/reLyX.in
@@ -14,11 +14,13 @@ $^W = 1; # same as 'perl -w'
 use vars qw($lyxdir $lyxname);
 
 my (@maybe_dir);
-my $mainscript = "reLyXmain.pl";
+my $mainscript;
 my $relyxdir;
 
 # Do this in a BEGIN block so it's done before the 'use lib' below
 BEGIN{
+# Variables may not be assigned before the BEGIN block
+$mainscript = "reLyXmain.pl";
 # This points to LyX library dir, e.g. /usr/local/share/lyx
 $lyxdir = "@LYX_DIR@";
 # This is just "." if you compiled from the source directory
@@ -38,8 +40,8 @@ my $dir = &dirname($name);
 push @maybe_dir, "$dir";
 # case 2: ran make but not make install.
 push @maybe_dir, "$dir/$srcdir";
-# case 3: environment variable LYX_DIR_11x has been set
-if (exists $ENV{LYX_DIR_11x}) { push @maybe_dir, "$ENV{LYX_DIR_11x}/reLyX"};
+# case 3: environment variable LYX_DIR_13x has been set
+if (exists $ENV{LYX_DIR_13x}) { push @maybe_dir, "$ENV{LYX_DIR_13x}/reLyX"};
 # case 4: e.g., reLyX in /opt/bin, $mainscript in /opt/share/lyx/reLyX
 push @maybe_dir, "$dir/../share/$lyxname/reLyX"; # case 4
 # case 5: configure figured out where $mainscript is