>>>>> "Angus" == Angus Leeming <[EMAIL PROTECTED]> writes:

>>  Hmmmmm. I don't suppose that it would be too terrible to always
>> copy rather than link this file. Jean-Marc?

Angus> Ping!

Yes, the patch is OK. I committed the two following versions.

JMarc

Index: lib/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/ChangeLog,v
retrieving revision 1.363.2.112
diff -u -p -r1.363.2.112 ChangeLog
--- lib/ChangeLog	13 Jun 2005 09:23:47 -0000	1.363.2.112
+++ lib/ChangeLog	14 Jun 2005 10:17:20 -0000
@@ -1,3 +1,12 @@
+2005-06-14  Jean-Marc Lasgouttes  <[EMAIL PROTECTED]>
+
+	* configure.m4: remove texput.log after testing for spaces.
+
+2005-06-14  Enrico Forestieri  <[EMAIL PROTECTED]>
+
+	* configure.m4: avoid using symbolic links since they confuse
+	miktex. 
+
 2005-06-10  Jean-Marc Lasgouttes  <[EMAIL PROTECTED]>
 
 	* configure.m4 (ps_to_pdf_command): use ps2pdf13 by default.
Index: lib/configure.m4
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/configure.m4,v
retrieving revision 1.60.2.23
diff -u -p -r1.60.2.23 configure.m4
--- lib/configure.m4	13 Jun 2005 09:23:48 -0000	1.60.2.23
+++ lib/configure.m4	14 Jun 2005 10:17:20 -0000
@@ -456,8 +456,8 @@ else
   MSG_RESULT(auto)
   rm -f wrap_chkconfig.ltx chkconfig.vars chkconfig.classes chklayouts.tex
   if test ! -r "chkconfig.ltx" ; then
-    ln -s "${srcdir}"/chkconfig.ltx .
-    rmlink=true
+    cp "${srcdir}"/chkconfig.ltx .
+    rmcopy=true
   fi
   cat >wrap_chkconfig.ltx <<EOF
 ${linuxdoc_cmd}
@@ -496,7 +496,7 @@ q
 changequote([,])dnl
   [eval] `cat chkconfig.vars | sed 's/-/_/g'`
 changequote(,)dnl
-  test -n "${rmlink}" && rm -f chkconfig.ltx
+  test -n "${rmcopy}" && rm -f chkconfig.ltx
 fi
 
 # Do we have all the files we need? Useful if latex did not run
@@ -541,7 +541,7 @@ else
     MSG_RESULT(no)
     tex_allows_spaces=false
   fi
-  rm -r "$fname".*
+  rm -r "$fname".* texput.log
 fi
 
 echo "creating $outfile"
Index: lib/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/ChangeLog,v
retrieving revision 1.708
diff -u -p -r1.708 ChangeLog
--- lib/ChangeLog	13 Jun 2005 09:36:57 -0000	1.708
+++ lib/ChangeLog	14 Jun 2005 10:25:41 -0000
@@ -1,3 +1,12 @@
+2005-06-14  Jean-Marc Lasgouttes  <[EMAIL PROTECTED]>
+
+	* configure.m4: remove texput.log after testing for spaces.
+
+2005-06-14  Enrico Forestieri  <[EMAIL PROTECTED]>
+
+	* configure.m4: avoid using symbolic links since they confuse
+	miktex. 
+
 2005-06-09  Michael Schmitt  <[EMAIL PROTECTED]>
 
 	* layouts/*: put all LabelStrings in quotes
Index: lib/configure.m4
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/configure.m4,v
retrieving revision 1.100
diff -u -p -r1.100 configure.m4
--- lib/configure.m4	13 Jun 2005 09:33:23 -0000	1.100
+++ lib/configure.m4	14 Jun 2005 10:25:42 -0000
@@ -471,8 +471,8 @@ else
   MSG_RESULT(auto)
   rm -f wrap_chkconfig.ltx chkconfig.vars chkconfig.classes chklayouts.tex
   if test ! -r "chkconfig.ltx" ; then
-    ln -s "${srcdir}"/chkconfig.ltx .
-    rmlink=true
+    cp "${srcdir}"/chkconfig.ltx .
+    rmcopy=true
   fi
   cat >wrap_chkconfig.ltx <<EOF
 ${linuxdoc_cmd}
@@ -511,7 +511,7 @@ q
 changequote([,])dnl
   [eval] `cat chkconfig.vars | sed 's/-/_/g'`
 changequote(,)dnl
-  test -n "${rmlink}" && rm -f chkconfig.ltx
+  test -n "${rmcopy}" && rm -f chkconfig.ltx
 fi
 
 # Do we have all the files we need? Useful if latex did not run
@@ -556,7 +556,7 @@ else
     MSG_RESULT(no)
     tex_allows_spaces=false
   fi
-  rm -r "$fname".*
+  rm -r "$fname".* texput.log
 fi
 
 echo "creating $outfile"

Reply via email to