texinfo update (Tue Apr 27 09:22:02 EDT 2004)

[Karl Berry]

Index: depcomp
===================================================================
RCS file: /cvsroot/texinfo/texinfo/depcomp,v
retrieving revision 1.9
retrieving revision 1.8
diff -c -r1.9 -r1.8
*** depcomp     27 Apr 2004 12:55:00 -0000      1.9
--- depcomp     11 Apr 2004 17:56:45 -0000      1.8
***************
*** 1,9 ****
  #! /bin/sh
  # depcomp - compile a program generating dependencies as side-effects
  
! scriptversion=2004-04-25.14
  
! # Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
  
  # This program is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
--- 1,9 ----
  #! /bin/sh
  # depcomp - compile a program generating dependencies as side-effects
  
! scriptversion=2003-12-28.12
  
! # Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
  
  # This program is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
***************
*** 287,318 ****
     base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
  
     if test "$libtool" = yes; then
-       # Dependencies are output in .lo.d with libtool 1.4.
-       # They are output in .o.d with libtool 1.5.
        tmpdepfile1="$dir.libs/$base.lo.d"
!       tmpdepfile2="$dir.libs/$base.o.d"
!       tmpdepfile3="$dir.libs/$base.d"
        "$@" -Wc,-MD
     else
        tmpdepfile1="$dir$base.o.d"
        tmpdepfile2="$dir$base.d"
-       tmpdepfile3="$dir$base.d"
        "$@" -MD
     fi
  
     stat=$?
     if test $stat -eq 0; then :
     else
!       rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
        exit $stat
     fi
  
     if test -f "$tmpdepfile1"; then
        tmpdepfile="$tmpdepfile1"
-    elif test -f "$tmpdepfile2"; then
-       tmpdepfile="$tmpdepfile2"
     else
!       tmpdepfile="$tmpdepfile3"
     fi
     if test -f "$tmpdepfile"; then
        sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
--- 287,312 ----
     base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
  
     if test "$libtool" = yes; then
        tmpdepfile1="$dir.libs/$base.lo.d"
!       tmpdepfile2="$dir.libs/$base.d"
        "$@" -Wc,-MD
     else
        tmpdepfile1="$dir$base.o.d"
        tmpdepfile2="$dir$base.d"
        "$@" -MD
     fi
  
     stat=$?
     if test $stat -eq 0; then :
     else
!       rm -f "$tmpdepfile1" "$tmpdepfile2"
        exit $stat
     fi
  
     if test -f "$tmpdepfile1"; then
        tmpdepfile="$tmpdepfile1"
     else
!       tmpdepfile="$tmpdepfile2"
     fi
     if test -f "$tmpdepfile"; then
        sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
P depcomp