texinfo ChangeLog util/texi2dvi

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       12/01/12 18:56:31

Modified files:
        .              : ChangeLog 
        util           : texi2dvi 

Log message:
        support --output in non-clean build modes

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1301&r2=1.1302
http://cvs.savannah.gnu.org/viewcvs/texinfo/util/texi2dvi?cvsroot=texinfo&r1=1.169&r2=1.170

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1301
retrieving revision 1.1302
diff -u -b -r1.1301 -r1.1302
--- ChangeLog   12 Jan 2012 18:54:39 -0000      1.1301
+++ ChangeLog   12 Jan 2012 18:56:31 -0000      1.1302
@@ -1,5 +1,7 @@
 2012-01-12  Karl Berry  <address@hidden>
 
+       * util/texi2dvi (move_to_dest): support --output in non-clean modes.
+
        * util/tests/automtest.sh: manual test from automake, via
        Stefano Lattarini, texinfo-devel 10 Jan 2012 10:27:55.
 
@@ -10615,7 +10617,7 @@
        * version 4.6.
 
 
-Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
 Free Software Foundation, Inc.
 
 Copying and distribution of this file, with or without modification,

Index: util/texi2dvi
===================================================================
RCS file: /sources/texinfo/texinfo/util/texi2dvi,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -b -r1.169 -r1.170
--- util/texi2dvi       7 Jan 2012 17:16:18 -0000       1.169
+++ util/texi2dvi       12 Jan 2012 18:56:31 -0000      1.170
@@ -1,6 +1,6 @@
 #! /bin/sh
 # texi2dvi --- produce DVI (or PDF) files from Texinfo (or (La)TeX) sources.
-# $Id: texi2dvi,v 1.169 2012/01/07 17:16:18 karl Exp $
+# $Id: texi2dvi,v 1.170 2012/01/12 18:56:31 karl Exp $
 #
 # Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002,
 # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
@@ -34,7 +34,7 @@
 set -e
 
 # This string is expanded automatically when this file is checked out.
-rcs_revision='$Revision: 1.169 $'
+rcs_revision='$Revision: 1.170 $'
 rcs_version=`set - $rcs_revision; echo $2`
 program=`echo $0 | sed -e 's!.*/!!'`
 
@@ -320,8 +320,7 @@
   -b, --batch         no interaction
   -D, --debug         turn on shell debugging (set -x)
   -h, --help          display this help and exit successfully
-  -o, --output=OFILE  leave output in OFILE (implies --clean);
-                        only one input FILE may be specified in this case
+  -o, --output=OFILE  leave output in OFILE; only one input FILE is allowed
   -q, --quiet         no output unless errors (implies --batch)
   -s, --silent        same as --quiet
   -v, --version       display version information and exit successfully
@@ -679,7 +678,10 @@
 # an auxiliary file with the same base name.
 move_to_dest ()
 {
-  # If we built in place, there is nothing to install, leave.
+#  echo "move_to_dest $*, tidy=$tidy, oname=$oname"
+
+  # If we built in place and have no output name, there is nothing to
+  # do, so just return.
   case $tidy:$oname in
     false:) return;;
   esac
@@ -697,9 +699,12 @@
     case $tidy:$oname in
       true:)  destdir=$orig_pwd
               destfile=$destdir/$file;;
-      *:*)    destfile=`output_base_name "$file"`
+      true:*) destfile=`output_base_name "$file"`
+              destdir=`dirname "$destfile"`;;
+      false:*) destfile=$oname
               destdir=`dirname "$destfile"`;;
     esac
+ 
     # We want to compare the source location and the output location,
     # and if they are different, do the move.  But if they are the
     # same, we must preserve the source.  Since we can't assume