texinfo install-sh,1.4,1.5 mkinstalldirs,1.1.1.1,1.2

[karl]

Update of /cvsroot/texinfo/texinfo
In directory sheep:/tmp/cvs-serv16917

Modified Files:
        install-sh mkinstalldirs 
Log Message:
update from automake

Index: install-sh
===================================================================
RCS file: /cvsroot/texinfo/texinfo/install-sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** install-sh  14 Jan 2004 13:45:21 -0000      1.4
--- install-sh  17 Feb 2004 00:48:48 -0000      1.5
***************
*** 2,6 ****
  # install - install a program, script, or datafile
  
! scriptversion=2004-01-13.14
  
  # This originates from X11R5 (mit/util/scripts/install.sh), which was
--- 2,6 ----
  # install - install a program, script, or datafile
  
! scriptversion=2004-02-15.20
  
  # This originates from X11R5 (mit/util/scripts/install.sh), which was
***************
*** 229,233 ****
        pathcomp=$pathcomp$1
        shift
!       test -d "$pathcomp" || $mkdirprog "$pathcomp"
        pathcomp=$pathcomp/
      done
--- 229,239 ----
        pathcomp=$pathcomp$1
        shift
!       if test ! -d "$pathcomp"; then
!         $mkdirprog "$pathcomp" || lasterr=$?
!       # mkdir can fail with a `File exist' error in case several
!       # install-sh are creating the directory concurrently.  This
!       # is OK.
!       test ! -d "$pathcomp" && { (exit ${lasterr-1}); exit; }
!       fi
        pathcomp=$pathcomp/
      done

Index: mkinstalldirs
===================================================================
RCS file: /cvsroot/texinfo/texinfo/mkinstalldirs,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** mkinstalldirs       6 Dec 2003 01:30:41 -0000       1.1.1.1
--- mkinstalldirs       17 Feb 2004 00:48:48 -0000      1.2
***************
*** 2,6 ****
  # mkinstalldirs --- make directory hierarchy
  
! scriptversion=2003-11-08.23
  
  # Original author: Noah Friedman <address@hidden>
--- 2,6 ----
  # mkinstalldirs --- make directory hierarchy
  
! scriptversion=2004-02-15.20
  
  # Original author: Noah Friedman <address@hidden>
***************
*** 67,73 ****
  esac
  
  case $dirmode in
    '')
!     if mkdir -p -- . 2>/dev/null; then
        echo "mkdir -p -- $*"
        exec mkdir -p -- "$@"
--- 67,79 ----
  esac
  
+ # Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
+ # mkdir -p a/c at the same time, both will detect that a is missing,
+ # one will create a, then the other will try to create a and die with
+ # a "File exists" error.  This is a problem when calling mkinstalldirs
+ # from a parallel make.  We use --version in the probe to restrict
+ # ourselves to GNU mkdir, which is thread-safe.
  case $dirmode in
    '')
!     if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
        echo "mkdir -p -- $*"
        exec mkdir -p -- "$@"
***************
*** 78,91 ****
        # exists.
        test -d ./-p && rmdir ./-p
!       test -d ./-- && rmdir ./--
      fi
      ;;
    *)
!     if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
        echo "mkdir -m $dirmode -p -- $*"
        exec mkdir -m "$dirmode" -p -- "$@"
      else
        # Clean up after NextStep and OpenStep mkdir.
!       for d in ./-m ./-p ./-- "./$dirmode";
        do
          test -d $d && rmdir $d
--- 84,98 ----
        # exists.
        test -d ./-p && rmdir ./-p
!       test -d ./--version && rmdir ./--version
      fi
      ;;
    *)
!     if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
!        test ! -d ./--version; then
        echo "mkdir -m $dirmode -p -- $*"
        exec mkdir -m "$dirmode" -p -- "$@"
      else
        # Clean up after NextStep and OpenStep mkdir.
!       for d in ./-m ./-p ./--version "./$dirmode";
        do
          test -d $d && rmdir $d