Sync with autotools.

diff --git a/config/install-sh b/config/install-sh
index 11870f1b0192aa3f321bc3a82552d27f0aa2352d..36f96f3e033cfaeefc092147d99d92f78e030d12 100755 (executable)
--- a/config/install-sh
+++ b/config/install-sh
@@ -56,7 +56,7 @@ dir_arg=""
 
 while [ x"$1" != x ]; do
     case $1 in
 
 while [ x"$1" != x ]; do
     case $1 in

-       -c) instcmd="$cpprog"
+       -c) instcmd=$cpprog

            shift
            continue;;
 
            shift
            continue;;
 


@@ -79,7 +79,7 @@ while [ x"$1" != x ]; do
            shift
            continue;;
 
            shift
            continue;;
 

-       -s) stripcmd="$stripprog"
+       -s) stripcmd=$stripprog

            shift
            continue;;
 
            shift
            continue;;
 


@@ -106,7 +106,7 @@ done
 
 if [ x"$src" = x ]
 then
 
 if [ x"$src" = x ]
 then

-       echo "install:  no input file specified"
+       echo "$0: no input file specified" >&2

        exit 1
 else
        :
        exit 1
 else
        :


@@ -115,8 +115,8 @@ fi
 if [ x"$dir_arg" != x ]; then
        dst=$src
        src=""
 if [ x"$dir_arg" != x ]; then
        dst=$src
        src=""

-       
-       if [ -d $dst ]; then
+
+       if [ -d "$dst" ]; then

                instcmd=:
                chmodcmd=""
        else
                instcmd=:
                chmodcmd=""
        else


@@ -125,20 +125,20 @@ if [ x"$dir_arg" != x ]; then
 else
 
 # Waiting for this to be detected by the "$instcmd $src $dsttmp" command
 else
 
 # Waiting for this to be detected by the "$instcmd $src $dsttmp" command

-# might cause directories to be created, which would be especially bad 
+# might cause directories to be created, which would be especially bad

 # if $src (and thus $dsttmp) contains '*'.
 
        if [ -f "$src" ] || [ -d "$src" ]
        then
                :
        else
 # if $src (and thus $dsttmp) contains '*'.
 
        if [ -f "$src" ] || [ -d "$src" ]
        then
                :
        else

-               echo "install:  $src does not exist"
+               echo "$0: $src does not exist" >&2

                exit 1
        fi
                exit 1
        fi

-       
+

        if [ x"$dst" = x ]
        then
        if [ x"$dst" = x ]
        then

-               echo "install:  no destination specified"
+               echo "$0: no destination specified" >&2

                exit 1
        else
                :
                exit 1
        else
                :


@@ -147,16 +147,16 @@ else
 # If destination is a directory, append the input filename; if your system
 # does not like double slashes in filenames, you may need to add some logic
 
 # If destination is a directory, append the input filename; if your system
 # does not like double slashes in filenames, you may need to add some logic
 

-       if [ -d $dst ]
+       if [ -d "$dst" ]

        then
        then

-               dst="$dst"/`basename $src`
+               dst=$dst/`basename "$src"`

        else
                :
        fi
 fi
 
 ## this sed command emulates the dirname command
        else
                :
        fi
 fi
 
 ## this sed command emulates the dirname command

-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`

 
 # Make sure that the destination directory exists.
 #  this part is taken from Noah Friedman's mkinstalldirs script
 
 # Make sure that the destination directory exists.
 #  this part is taken from Noah Friedman's mkinstalldirs script


@@ -165,69 +165,73 @@ dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
 if [ ! -d "$dstdir" ]; then
 defaultIFS='
        '
 if [ ! -d "$dstdir" ]; then
 defaultIFS='
        '

-IFS="${IFS-${defaultIFS}}"
+IFS="${IFS-$defaultIFS}"

 
 

-oIFS="${IFS}"
+oIFS=$IFS

 # Some sh's can't handle IFS=/ for some reason.
 IFS='%'
 # Some sh's can't handle IFS=/ for some reason.
 IFS='%'

-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
+set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+IFS=$oIFS

 
 pathcomp=''
 
 while [ $# -ne 0 ] ; do
 
 pathcomp=''
 
 while [ $# -ne 0 ] ; do

-       pathcomp="${pathcomp}${1}"
+       pathcomp=$pathcomp$1

        shift
 
        shift
 

-       if [ ! -d "${pathcomp}" ] ;
+       if [ ! -d "$pathcomp" ] ;

         then
         then

-               $mkdirprog "${pathcomp}"
+               $mkdirprog "$pathcomp"

        else
                :
        fi
 
        else
                :
        fi
 

-       pathcomp="${pathcomp}/"
+       pathcomp=$pathcomp/

 done
 fi
 
 if [ x"$dir_arg" != x ]
 then
 done
 fi
 
 if [ x"$dir_arg" != x ]
 then

-       $doit $instcmd $dst &&
+       $doit $instcmd "$dst" &&

 
 

-       if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi &&
-       if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi &&
-       if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi &&
-       if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi
+       if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
+       if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
+       if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
+       if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi

 else
 
 # If we're going to rename the final executable, determine the name now.
 
 else
 
 # If we're going to rename the final executable, determine the name now.
 

-       if [ x"$transformarg" = x ] 
+       if [ x"$transformarg" = x ]

        then
        then

-               dstfile=`basename $dst`
+               dstfile=`basename "$dst"`

        else
        else

-               dstfile=`basename $dst $transformbasename | 
+               dstfile=`basename "$dst" $transformbasename |

                        sed $transformarg`$transformbasename
        fi
 
 # don't allow the sed command to completely eliminate the filename
 
                        sed $transformarg`$transformbasename
        fi
 
 # don't allow the sed command to completely eliminate the filename
 

-       if [ x"$dstfile" = x ] 
+       if [ x"$dstfile" = x ]

        then
        then

-               dstfile=`basename $dst`
+               dstfile=`basename "$dst"`

        else
                :
        fi
 
        else
                :
        fi
 

-# Make a temp file name in the proper directory.
+# Make a couple of temp file names in the proper directory.

 
        dsttmp=$dstdir/#inst.$$#
 
        dsttmp=$dstdir/#inst.$$#

+       rmtmp=$dstdir/#rm.$$#

 
 

-# Move or copy the file name to the temp name
+# Trap to clean up temp files at exit.

 
 

-       $doit $instcmd $src $dsttmp &&
+       trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
+       trap '(exit $?); exit' 1 2 13 15

 
 

-       trap "rm -f ${dsttmp}" 0 &&
+# Move or copy the file name to the temp name
+
+       $doit $instcmd "$src" "$dsttmp" &&

 
 # and set any options; do chmod last to preserve setuid bits
 
 
 # and set any options; do chmod last to preserve setuid bits
 


@@ -235,17 +239,38 @@ else
 # ignore errors from any of these, just make sure not to ignore
 # errors from the above "$doit $instcmd $src $dsttmp" command.
 
 # ignore errors from any of these, just make sure not to ignore
 # errors from the above "$doit $instcmd $src $dsttmp" command.
 

-       if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi &&
-       if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi &&
-       if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi &&
-       if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi &&
+       if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
+       if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
+       if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
+       if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
+
+# Now remove or move aside any old file at destination location.  We try this
+# two ways since rm can't unlink itself on some systems and the destination
+# file might be busy for other reasons.  In this case, the final cleanup
+# might fail but the new file should still install successfully.
+
+{
+       if [ -f "$dstdir/$dstfile" ]
+       then
+               $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
+               $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
+               {
+                 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+                 (exit 1); exit
+               }
+       else
+               :
+       fi
+} &&

 
 # Now rename the file to the real destination.
 
 
 # Now rename the file to the real destination.
 

-       $doit $rmcmd -f $dstdir/$dstfile &&
-       $doit $mvcmd $dsttmp $dstdir/$dstfile 
+       $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"

 
 fi &&
 
 
 fi &&
 

+# The final little trick to "correctly" pass the exit status to the exit trap.

 
 

-exit 0
+{
+       (exit 0); exit
+}