more fixes

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

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 4a1e4cd12b676d0ad1334ca2352e0ec4543aa5a5..22a8e1f68f1a6a42e0e6850ebfd199a8030a2985 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-12  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+       * reLyX/configure.ac: make sure the prefix is correctly quoted.
+
+       * configure.m4: small visual fix to the search for groff
+
 2005-01-06  Angus Leeming  <leeming@lyx.org>
 
        * Makefile.am: remove mention of configure.cmd.

diff --git a/lib/configure.m4 b/lib/configure.m4
index d47a25bf62b52912187c05c7cf8efe4de58cada8..20a2799aa0b3fa4a95b9e4827909b3abf01a3ea3 100644 (file)
--- a/lib/configure.m4
+++ b/lib/configure.m4
@@ -330,7 +330,7 @@ test "$DVIPNG" = "dvipng" && \
 
 # Search a *roff program (used to translate tables in ASCII export)
 LYXRC_PROG([for a *roff formatter], \ascii_roff_command, dnl
-  'groff -t -Tlatin1 $$FName' nroff,dnl
+  "groff -t -Tlatin1 \$\$FName" nroff,dnl
   test "$prog" = "nroff" && prog='tbl $$FName | nroff')
 
 # Search the ChkTeX program

diff --git a/lib/reLyX/configure.ac b/lib/reLyX/configure.ac
index dcc4fe9f659a025564274bb25066efebead21337..880bb6399e75546aea92f44e6c6793f1ffb44c13 100644 (file)
--- a/lib/reLyX/configure.ac
+++ b/lib/reLyX/configure.ac
@@ -24,6 +24,8 @@ test -x reLyX && rm -f reLyX
 # fix the value of the prefixes.
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+# make sure prefix is correctly quoted
+prefix="'$prefix'"
 
 # we need to expand ${datadir} to put it into the reLyX wrapper.
 LYX_DIR=`eval "echo \`eval \"echo ${datadir}/${PACKAGE}\"\`"`