From 34c64b206e636ef6806824cb0e373d378ea196f2 Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Fri, 5 Nov 1999 16:42:14 +0000
Subject: [PATCH] Two patches from Kayvan

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@294 a592a061-630c-0410-9148-cb99ea01b6c8
---
 ChangeLog               | 8 ++++++++
 config/lib_configure.m4 | 2 +-
 development/lyx.spec.in | 4 ++--
 lib/configure           | 2 +-
 lib/lyxrc.example       | 4 ++--
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e3b05331fd..66a3b0c140 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+1999-11-05  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+	* config/lib_configure.m4,lib/configure,lib/lyxrc.example: update
+	from Kayvan to fix the tth invokation.
+
+	* development/lyx.spec.in: updates from Kayvan to reflect the
+	changes of file names.
+
 1999-11-05  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
 	* src/text2.C (InsertStringB): use std::copy
diff --git a/config/lib_configure.m4 b/config/lib_configure.m4
index 1fb98db8f4..fed13da445 100644
--- a/config/lib_configure.m4
+++ b/config/lib_configure.m4
@@ -247,7 +247,7 @@ esac
 # Search for a latex to html converter
 SEARCH_PROG([for an HTML converter], TOHTML, tth latex2html hevea)
 case $TOHTML in
-	tth) html_command="tth -t '\$\$Fname'";;
+	tth) html_command="tth -t < '\$\$FName' > '\$\$OutName'";;
  latex2html) html_command="latex2html -no_subdir -split 0 -show_section_numbers '\$\$FName'";;
       hevea) html_command="hevea -s '\$\$FName'";;
 esac
diff --git a/development/lyx.spec.in b/development/lyx.spec.in
index 93fdcbc1cc..a47d62c98a 100644
--- a/development/lyx.spec.in
+++ b/development/lyx.spec.in
@@ -110,8 +110,8 @@ cd $RPM_INSTALL_PREFIX/share/lyx
 ./configure --srcdir
 
 %files
-%attr(-,root,root) %doc ABOUT-NLS ANNOUNCE CHANGES COPYING 
-%attr(-,root,root) %doc README UPGRADING WHATSNEW
+%attr(-,root,root) %doc ABOUT-NLS ANNOUNCE OLD-CHANGES COPYING 
+%attr(-,root,root) %doc README UPGRADING WHATSNEW ChangeLog
 %attr(-,root,root) %doc lib/CREDITS README.reLyX
 
 %attr(-,root,root) /usr/bin/*
diff --git a/lib/configure b/lib/configure
index fd11f8c33a..35951e5fcc 100755
--- a/lib/configure
+++ b/lib/configure
@@ -598,7 +598,7 @@ if test -z "$TOHTML" ; then
 fi
 
 case $TOHTML in
-	tth) html_command="tth -t '\$\$Fname'";;
+	tth) html_command="tth -t < '\$\$FName' > '\$\$OutName'";;
  latex2html) html_command="latex2html -no_subdir -split 0 -show_section_numbers '\$\$FName'";;
       hevea) html_command="hevea -s '\$\$FName'";;
 esac
diff --git a/lib/lyxrc.example b/lib/lyxrc.example
index f7d2998742..36d8e5df0d 100644
--- a/lib/lyxrc.example
+++ b/lib/lyxrc.example
@@ -123,13 +123,13 @@
 # You should include options. The default is autodetected: the programs 
 # checked are tth, latex2html and hevea, and the default command lines
 # used are:  
-#\html_command "tth -t '$$Fname'"
+#\html_command "tth -t < '$$FName' > '$$OutName'"
 #\html_command "latex2html -no_subdir -split 0 -show_section_numbers '$$FName'"
 #\html_command "hevea -s '$$FName'"
 # The variable name $$FName is replaced with the name of the .tex
 # file, and $$OutName is replaced with the name of the html file.
 # Example: use this to let math be italic with tth.
-#\html_command "tth -t -i $$FName"
+#\html_command "tth -t -i < '$$FName' > '$$OutName'"
 
 # If you want to pass extra flags to the LinuxDoc sgml scripts, insert them
 # here.