Update buildsys

FossilOrigin-Name: 3f1ad168e1628424fa94b05d467c208e8c4cc6c4f29a596f60d9c1c528934fca

build-aux/install-sh

@@ -1,501 +1,301 @@
 #!/bin/sh
+#
+# $NetBSD: install-sh.in,v 1.6 2012/01/11 13:07:31 hans Exp $
+# This script now also installs multiple files, but might choke on installing
+# multiple files with spaces in the file names.
+#
 # install - install a program, script, or datafile
-
+# This comes from X11R5 (mit/util/scripts/install.sh).
-scriptversion=2013-12-25.23; # UTC
-
-# This originates from X11R5 (mit/util/scripts/install.sh), which was
-# later released in X11R6 (xc/config/util/install.sh) with the
-# following copyright and license.
 #
-# Copyright (C) 1994 X Consortium
+# Copyright 1991 by the Massachusetts Institute of Technology
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy
+# Permission to use, copy, modify, distribute, and sell this software and its
-# of this software and associated documentation files (the "Software"), to
+# documentation for any purpose is hereby granted without fee, provided that
-# deal in the Software without restriction, including without limitation the
+# the above copyright notice appear in all copies and that both that
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# copyright notice and this permission notice appear in supporting
-# sell copies of the Software, and to permit persons to whom the Software is
+# documentation, and that the name of M.I.T. not be used in advertising or
-# furnished to do so, subject to the following conditions:
+# publicity pertaining to distribution of the software without specific,
-#
+# written prior permission.  M.I.T. makes no representations about the
-# The above copyright notice and this permission notice shall be included in
+# suitability of this software for any purpose.  It is provided "as is"
-# all copies or substantial portions of the Software.
+# without express or implied warranty.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the X Consortium shall not
-# be used in advertising or otherwise to promote the sale, use or other deal-
-# ings in this Software without prior written authorization from the X Consor-
-# tium.
-#
-#
-# FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
-# 'make' implicit rules from creating a file called install from it
+# `make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
 # from scratch.
 
-tab='	'
+# set DOITPROG to echo to test this script
-nl='
-'
-IFS=" $tab$nl"
 
-# Set DOITPROG to "echo" to test this script.
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit="${DOITPROG-}"
 
-doit=${DOITPROG-}
-doit_exec=${doit:-exec}
 
-# Put in absolute file names if you don't have them in your path;
+# put in absolute paths if you don't have them in your path; or use env. vars.
-# or use environment vars.
 
-chgrpprog=${CHGRPPROG-chgrp}
+awkprog="${AWKPROG-awk}"
-chmodprog=${CHMODPROG-chmod}
+mvprog="${MVPROG-mv}"
-chownprog=${CHOWNPROG-chown}
+cpprog="${CPPROG-cp}"
-cmpprog=${CMPPROG-cmp}
+chmodprog="${CHMODPROG-chmod}"
-cpprog=${CPPROG-cp}
+chownprog="${CHOWNPROG-chown}"
-mkdirprog=${MKDIRPROG-mkdir}
+chgrpprog="${CHGRPPROG-chgrp}"
-mvprog=${MVPROG-mv}
+stripprog="${STRIPPROG-strip}"
-rmprog=${RMPROG-rm}
+rmprog="${RMPROG-rm}"
-stripprog=${STRIPPROG-strip}
+mkdirprog="${MKDIRPROG-mkdir}"
 
-posix_mkdir=
+instcmd="$cpprog"
-
+instflags=""
-# Desired mode of installed file.
+pathcompchmodcmd="$chmodprog 755"
-mode=0755
+chmodcmd="$chmodprog 755"
-
+chowncmd=""
-chgrpcmd=
+chgrpcmd=""
-chmodcmd=$chmodprog
+stripcmd=""
-chowncmd=
+stripflags=""
-mvcmd=$mvprog
 rmcmd="$rmprog -f"
-stripcmd=
+mvcmd="$mvprog"
+src=""
+msrc=""
+dst=""
+dir_arg=""
+suffix=""
+suffixfmt=""
 
-src=
+while [ x"$1" != x ]; do
-dst=
-dir_arg=
-dst_arg=
-
-copy_on_change=false
-is_target_a_directory=possibly
-
-usage="\
-Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-   or: $0 [OPTION]... SRCFILES... DIRECTORY
-   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-   or: $0 [OPTION]... -d DIRECTORIES...
-
-In the 1st form, copy SRCFILE to DSTFILE.
-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-In the 4th, create DIRECTORIES.
-
-Options:
-     --help     display this help and exit.
-     --version  display version info and exit.
-
-  -c            (ignored)
-  -C            install only if different (preserve the last data modification time)
-  -d            create directories instead of installing files.
-  -g GROUP      $chgrpprog installed files to GROUP.
-  -m MODE       $chmodprog installed files to MODE.
-  -o USER       $chownprog installed files to USER.
-  -s            $stripprog installed files.
-  -t DIRECTORY  install into DIRECTORY.
-  -T            report an error if DSTFILE is a directory.
-
-Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
-  RMPROG STRIPPROG
-"
-
-while test $# -ne 0; do
     case $1 in
-    -c) ;;
+	-b) suffix=".old"
+	    shift
+	    continue;;
 
-    -C) copy_on_change=true;;
+	-B) suffixfmt="$2"
+	    shift
+	    shift
+	    continue;;
 
-    -d) dir_arg=true;;
+	-c) instcmd="$cpprog"
+	    shift
+	    continue;;
 
-    -g) chgrpcmd="$chgrpprog $2"
+	-d) dir_arg=true
-        shift;;
+	    shift
+	    continue;;
 
-    --help) echo "$usage"; exit $?;;
+	-m) chmodcmd="$chmodprog $2"
+	    shift
+	    shift
+	    continue;;
 
-    -m) mode=$2
+	-m*)
-        case $mode in
+	    chmodcmd="$chmodprog ${1#-m}"
-          *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
+	    shift
-            echo "$0: invalid mode: $mode" >&2
+	    continue;;
-            exit 1;;
-        esac
-        shift;;
 
 	-o) chowncmd="$chownprog $2"
-        shift;;
-
-    -s) stripcmd=$stripprog;;
-
-    -t)
-        is_target_a_directory=always
-        dst_arg=$2
-        # Protect names problematic for 'test' and other utilities.
-        case $dst_arg in
-          -* | [=\(\)!]) dst_arg=./$dst_arg;;
-        esac
-        shift;;
-
-    -T) is_target_a_directory=never;;
-
-    --version) echo "$0 $scriptversion"; exit $?;;
-
-    --) shift
-        break;;
-
-    -*) echo "$0: invalid option: $1" >&2
-        exit 1;;
-
-    *)  break;;
-  esac
 	    shift
-done
+	    shift
+	    continue;;
 
-# We allow the use of options -d and -T together, by making -d
+	-g) chgrpcmd="$chgrpprog $2"
-# take the precedence; this is for compatibility with GNU install.
+	    shift
+	    shift
+	    continue;;
 
-if test -n "$dir_arg"; then
+	-s) stripcmd="$stripprog"
-  if test -n "$dst_arg"; then
+	    shift
-    echo "$0: target directory not allowed when installing a directory." >&2
+	    continue;;
-    exit 1
-  fi
-fi
 
-if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+	-S) stripcmd="$stripprog"
-  # When -d is used, all remaining arguments are directories to create.
+	    stripflags="-S $2 $stripflags"
-  # When -t is used, the destination is already specified.
+	    shift
-  # Otherwise, the last argument is the destination.  Remove it from $@.
+	    shift
-  for arg
+	    continue;;
-  do
+
-    if test -n "$dst_arg"; then
+	-p) instflags="-p"
-      # $@ is not empty: it contains at least $arg.
+	    shift
-      set fnord "$@" "$dst_arg"
+	    continue;;
-      shift # fnord
+
+	*)  if [ x"$msrc" = x ]
+	    then
+		msrc="$dst"
+	    else
+		msrc="$msrc $dst"
 	    fi
-    shift # arg
+	    src="$dst"
-    dst_arg=$arg
+	    dst="$1"
-    # Protect names problematic for 'test' and other utilities.
+	    shift
-    case $dst_arg in
+	    continue;;
-      -* | [=\(\)!]) dst_arg=./$dst_arg;;
     esac
 done
-fi
 
-if test $# -eq 0; then
+if [ x"$dir_arg" = x ]
-  if test -z "$dir_arg"; then
+then
-    echo "$0: no input file specified." >&2
+	dstisfile=""
-    exit 1
+	if [ ! -d "$dst" ]
-  fi
+	then
-  # It's OK to call 'install-sh -d' without argument.
+		if [ x"$msrc" = x"$src" ]
-  # This can happen when creating conditional directories.
+		then
-  exit 0
+			dstisfile=true
-fi
+		else
-
+			echo "install: destination is not a directory"
-if test -z "$dir_arg"; then
-  if test $# -gt 1 || test "$is_target_a_directory" = always; then
-    if test ! -d "$dst_arg"; then
-      echo "$0: $dst_arg: Is not a directory." >&2
 			exit 1
 		fi
 	fi
-fi
-
-if test -z "$dir_arg"; then
-  do_exit='(exit $ret); exit $ret'
-  trap "ret=129; $do_exit" 1
-  trap "ret=130; $do_exit" 2
-  trap "ret=141; $do_exit" 13
-  trap "ret=143; $do_exit" 15
-
-  # Set umask so as not to create temps with too-generous modes.
-  # However, 'strip' requires both read and write access to temps.
-  case $mode in
-    # Optimize common cases.
-    *644) cp_umask=133;;
-    *755) cp_umask=22;;
-
-    *[0-7])
-      if test -z "$stripcmd"; then
-        u_plus_rw=
 else
-        u_plus_rw='% 200'
+	msrc="$msrc $dst"
 fi
-      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+
-    *)
+if [ x"$msrc" = x ]
-      if test -z "$stripcmd"; then
+then
-        u_plus_rw=
+	echo "install: no destination specified"
+	exit 1
+fi      
+
+for srcarg in $msrc; do
+
+if [ x"$dir_arg" != x ]; then
+
+	dstarg="$srcarg"
 else
-        u_plus_rw=,u+rw
+	dstarg="$dst"
-      fi
-      cp_umask=$mode$u_plus_rw;;
-  esac
-fi
 
-for src
+# Waiting for this to be detected by the "$instcmd $srcarg $dsttmp" command
-do
-  # Protect names problematic for 'test' and other utilities.
-  case $src in
-    -* | [=\(\)!]) src=./$src;;
-  esac
-
-  if test -n "$dir_arg"; then
-    dst=$src
-    dstdir=$dst
-    test -d "$dstdir"
-    dstdir_status=$?
-  else
-
-    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
 # might cause directories to be created, which would be especially bad 
 # if $src (and thus $dsttmp) contains '*'.
-    if test ! -f "$src" && test ! -d "$src"; then
-      echo "$0: $src does not exist." >&2
-      exit 1
-    fi
 
-    if test -z "$dst_arg"; then
+	if [ -f "$srcarg" ]
-      echo "$0: no destination specified." >&2
-      exit 1
-    fi
-    dst=$dst_arg
-
-    # If destination is a directory, append the input filename; won't work
-    # if double slashes aren't ignored.
-    if test -d "$dst"; then
-      if test "$is_target_a_directory" = never; then
-        echo "$0: $dst_arg: Is a directory" >&2
-        exit 1
-      fi
-      dstdir=$dst
-      dst=$dstdir/`basename "$src"`
-      dstdir_status=0
-    else
-      dstdir=`dirname "$dst"`
-      test -d "$dstdir"
-      dstdir_status=$?
-    fi
-  fi
-
-  obsolete_mkdir_used=false
-
-  if test $dstdir_status != 0; then
-    case $posix_mkdir in
-      '')
-        # Create intermediate dirs using mode 755 as modified by the umask.
-        # This is like FreeBSD 'install' as of 1997-10-28.
-        umask=`umask`
-        case $stripcmd.$umask in
-          # Optimize common cases.
-          *[2367][2367]) mkdir_umask=$umask;;
-          .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
-          *[0-7])
-            mkdir_umask=`expr $umask + 22 \
-              - $umask % 100 % 40 + $umask % 20 \
-              - $umask % 10 % 4 + $umask % 2
-            `;;
-          *) mkdir_umask=$umask,go-w;;
-        esac
-
-        # With -d, create the new directory with the user-specified mode.
-        # Otherwise, rely on $mkdir_umask.
-        if test -n "$dir_arg"; then
-          mkdir_mode=-m$mode
-        else
-          mkdir_mode=
-        fi
-
-        posix_mkdir=false
-        case $umask in
-          *[123567][0-7][0-7])
-            # POSIX mkdir -p sets u+wx bits regardless of umask, which
-            # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-            ;;
-          *)
-            tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-            trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-            if (umask $mkdir_umask &&
-                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
 	then
-              if test -z "$dir_arg" || {
+		doinst="$instcmd $instflags"
-                   # Check for POSIX incompatibilities with -m.
+	elif [ -d "$srcarg" ]
-                   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+	then
-                   # other-writable bit of parent directory when it shouldn't.
+		echo "install: $srcarg: not a regular file"
-                   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+		exit 1
-                   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+	elif [ "$srcarg" = "/dev/null" ]
-                   case $ls_ld_tmpdir in
+	then
-                     d????-?r-*) different_mode=700;;
+		doinst="$cpprog"
-                     d????-?--*) different_mode=755;;
-                     *) false;;
-                   esac &&
-                   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-                     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-                     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-                   }
-                 }
-              then posix_mkdir=:
-              fi
-              rmdir "$tmpdir/d" "$tmpdir"
 	else
-              # Remove any dirs left behind by ancient mkdir implementations.
+		echo "install:  $srcarg does not exist"
-              rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+		exit 1
 	fi
-            trap '' 0;;
-        esac;;
-    esac
 	
-    if
+# If destination is a directory, append the input filename; if your system
-      $posix_mkdir && (
+# does not like double slashes in filenames, you may need to add some logic
-        umask $mkdir_umask &&
-        $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
-      )
-    then :
-    else
 
-      # The umask is ridiculous, or mkdir does not conform to POSIX,
+	if [ -d "$dstarg" ]
-      # or it failed possibly due to a race condition.  Create the
+	then
-      # directory the slow way, step by step, checking for races as we go.
+		dstarg="$dstarg"/`basename "$srcarg"`
+	fi
+fi
 
-      case $dstdir in
+## this sed command emulates the dirname command
-        /*) prefix='/';;
+dstdir=`echo "$dstarg" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-        [-=\(\)!]*) prefix='./';;
-        *)  prefix='';;
-      esac
 
-      oIFS=$IFS
+# Make sure that the destination directory exists.
-      IFS=/
+#  this part is taken from Noah Friedman's mkinstalldirs script
-      set -f
+
-      set fnord $dstdir
+# Skip lots of stat calls in the usual case.
+if [ ! -d "$dstdir" ]; then
+defaultIFS='	
+'
+IFS="${IFS-${defaultIFS}}"
+
+oIFS="${IFS}"
+# Some sh's can't handle IFS=/ for some reason.
+IFS='%'
+set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
+IFS="${oIFS}"
+
+pathcomp=''
+
+while [ $# -ne 0 ] ; do
+	pathcomp="${pathcomp}${1}"
 	shift
-      set +f
-      IFS=$oIFS
 
-      prefixes=
+	if [ ! -d "${pathcomp}" ] ;
+        then
+		$doit $mkdirprog "${pathcomp}"
+        	if [ x"$chowncmd" != x ]; then $doit $chowncmd "${pathcomp}"; else true ; fi &&
+        	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "${pathcomp}"; else true ; fi &&
+        	if [ x"$pathcompchmodcmd" != x ]; then $doit $pathcompchmodcmd "${pathcomp}"; else true ; fi
 
-      for d
-      do
-        test X"$d" = X && continue
-
-        prefix=$prefix$d
-        if test -d "$prefix"; then
-          prefixes=
 	else
-          if $posix_mkdir; then
+		true
-            (umask=$mkdir_umask &&
-             $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-            # Don't fail if two instances are running concurrently.
-            test -d "$prefix" || exit 1
-          else
-            case $prefix in
-              *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-              *) qprefix=$prefix;;
-            esac
-            prefixes="$prefixes '$qprefix'"
 	fi
-        fi
+
-        prefix=$prefix/
+	pathcomp="${pathcomp}/"
 done
-
-      if test -n "$prefixes"; then
-        # Don't fail if two instances are running concurrently.
-        (umask $mkdir_umask &&
-         eval "\$doit_exec \$mkdirprog $prefixes") ||
-          test -d "$dstdir" || exit 1
-        obsolete_mkdir_used=true
-      fi
-    fi
 fi
 
-  if test -n "$dir_arg"; then
+	if [ x"$dir_arg" != x ]
-    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+	then
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+		if [ -d "$dstarg" ]; then
-    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+			true
-      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+		else
+			$doit $mkdirprog "$dstarg" &&
+
+			if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dstarg"; else true ; fi &&
+			if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dstarg"; else true ; fi &&
+			if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dstarg"; else true ; fi
+		fi
 	else
 
-    # Make a couple of temp file names in the proper directory.
+		if [ x"$dstisfile" = x ]
-    dsttmp=$dstdir/_inst.$$_
+		then
-    rmtmp=$dstdir/_rm.$$_
+			file=$srcarg
+		else
+			file=$dst
+		fi
 
-    # Trap to clean up those temp files at exit.
+		dstfile=`basename "$file"`
-    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+		dstfinal="$dstdir/$dstfile"
 
-    # Copy the file name to the temp name.
+# Make a temp file name in the proper directory.
-    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+
+		dsttmp=$dstdir/#inst.$$#
+
+# Make a backup file name in the proper directory.
+		case x$suffixfmt in
+		*%*)	suffix=`echo x |
+			$awkprog -v bname="$dstfinal" -v fmt="$suffixfmt" '
+			{ cnt = 0;
+			  do {
+				sfx = sprintf(fmt, cnt++);
+				name = bname sfx;
+			  } while (system("test -f " name) == 0);
+			  print sfx; }' -`;;
+		x)	;;
+		*)	suffix="$suffixfmt";;
+		esac
+		dstbackup="$dstfinal$suffix"
+
+# Move or copy the file name to the temp name
+
+		$doit $doinst $srcarg "$dsttmp" &&
+
+		trap "rm -f ${dsttmp}" 0 &&
+
+# and set any options; do chmod last to preserve setuid bits
 
-    # and set any options; do chmod last to preserve setuid bits.
-    #
 # If any of these fail, we abort the whole thing.  If we want to
 # ignore errors from any of these, just make sure not to ignore
-    # errors from the above "$doit $cpprog $src $dsttmp" command.
+# errors from the above "$doit $instcmd $src $dsttmp" command.
-    #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
-    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
-    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
 
-    # If -C, don't bother to copy if it wouldn't change the file.
+		if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else true;fi &&
-    if $copy_on_change &&
+		if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else true;fi &&
-       old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
+		if [ x"$stripcmd" != x ]; then $doit $stripcmd $stripflags "$dsttmp"; else true;fi &&
-       new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
+		if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else true;fi &&
-       set -f &&
-       set X $old && old=:$2:$4:$5:$6 &&
-       set X $new && new=:$2:$4:$5:$6 &&
-       set +f &&
-       test "$old" = "$new" &&
-       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
-    then
-      rm -f "$dsttmp"
-    else
-      # Rename the file to the real destination.
-      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
-
-      # The rename failed, perhaps because mv can't rename something else
-      # to itself, or perhaps because mv is so ancient that it does not
-      # support -f.
-      {
-        # 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.
-        {
-          test ! -f "$dst" ||
-          $doit $rmcmd -f "$dst" 2>/dev/null ||
-          { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-            { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-          } ||
-          { echo "$0: cannot unlink or rename $dst" >&2
-            (exit 1); exit 1
-          }
-        } &&
 
 # Now rename the file to the real destination.
-        $doit $mvcmd "$dsttmp" "$dst"
-      }
-    fi || exit 1
 
-    trap '' 0
+		if [ x"$suffix" != x ] && [ -f "$dstfinal" ]
+		then
+			$doit $mvcmd "$dstfinal" "$dstbackup"
+		else
+			$doit $rmcmd -f "$dstfinal"
+		fi &&
+		$doit $mvcmd "$dsttmp" "$dstfinal"
 	fi
-done
 
-# Local variables:
+done &&
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+
-# time-stamp-start: "scriptversion="
+
-# time-stamp-format: "%:y-%02m-%02d.%02H"
+exit 0
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:

build-aux/m4/buildsys.m4

@@ -1,6 +1,6 @@
 dnl
 dnl Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016, 2017,
-dnl               2018, 2020
+dnl               2018, 2020, 2021
 dnl   Jonathan Schleifer <js@nil.im>
 dnl
 dnl https://fossil.nil.im/buildsys
@@ -36,6 +36,13 @@ AC_DEFUN([BUILDSYS_INIT], [
 		;;
 	esac
 
+	AC_PROG_INSTALL
+	case "$INSTALL" in
+	./build-aux/install-sh*)
+		INSTALL="$PWD/$INSTALL"
+		;;
+	esac
+
 	AC_CONFIG_COMMANDS_PRE([
 		AS_IF([test x"$GCC" = x"yes"],
 			[AC_SUBST(DEP_CFLAGS, '-MD -MF $${out%.o}.dep')])
@@ -49,7 +56,17 @@ AC_DEFUN([BUILDSYS_INIT], [
 		AC_SUBST(AMIGA_LIB_CFLAGS)
 		AC_SUBST(AMIGA_LIB_LDFLAGS)
 
+		case "$build_os" in
+		morphos*)
+			dnl Don't use tput on MorphOS: The colored output is
+			dnl quite unreadable and in some MorphOS versions the
+			dnl output from tput is not 8-bit safe, with awk (for
+			dnl AC_SUBST) failing as a result.
+			;;
+		*)
 			AC_PATH_PROG(TPUT, tput)
+			;;
+		esac
 
 		AS_IF([test x"$TPUT" != x""], [
 			if x=$($TPUT el 2>/dev/null); then
@@ -117,8 +134,7 @@ AC_DEFUN([BUILDSYS_CHECK_IOS], [
 		AC_EGREP_CPP(yes, [
 			#include <TargetConditionals.h>
 
-				#if (defined(TARGET_OS_IPHONE) && \
+			#if (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) || \
-				    TARGET_OS_IPHONE) || \
 			    (defined(TARGET_OS_SIMULATOR) && \
 			    TARGET_OS_SIMULATOR)
 			yes
@@ -158,8 +174,8 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
 	AC_REQUIRE([BUILDSYS_CHECK_IOS])
 	AC_MSG_CHECKING(for shared library system)
 
-	case "$host_os" in
+	case "$host" in
-		darwin*)
+	*-*-darwin*)
 		AC_MSG_RESULT(Darwin)
 		LIB_CFLAGS='-fPIC -DPIC'
 		LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}'
@@ -181,10 +197,10 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
 		UNINSTALL_PLUGIN='&& rm -fr ${DESTDIR}${plugindir}/$$i'
 		CLEAN_LIB=''
 		;;
-		mingw* | cygwin*)
+	*-*-mingw* | *-*-cygwin*)
 		AC_MSG_RESULT(MinGW / Cygwin)
 		LIB_CFLAGS=''
-			LIB_LDFLAGS='-shared -Wl,--export-all-symbols,--out-implib,lib${SHARED_LIB}.a'
+		LIB_LDFLAGS='-shared -Wl,--export-all-symbols,--out-implib,lib$$out.a'
 		LIB_LDFLAGS_INSTALL_NAME=''
 		LIB_PREFIX=''
 		LIB_SUFFIX='.dll'
@@ -197,9 +213,9 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
 		UNINSTALL_LIB='&& rm -f ${DESTDIR}${bindir}/$$i ${DESTDIR}${libdir}/lib$$i.a'
 		INSTALL_PLUGIN='&& ${INSTALL} -m 755 $$i ${DESTDIR}${plugindir}/$$i'
 		UNINSTALL_PLUGIN='&& rm -f ${DESTDIR}${plugindir}/$$i'
-			CLEAN_LIB='${SHARED_LIB}.a'
+		CLEAN_LIB='${SHARED_LIB}.a ${SHARED_LIB_NOINST}.a'
 		;;
-		openbsd* | mirbsd*)
+	*-*-openbsd* | *-*-mirbsd*)
 		AC_MSG_RESULT(OpenBSD)
 		LIB_CFLAGS='-fPIC -DPIC'
 		LIB_LDFLAGS='-shared'
@@ -217,10 +233,10 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
 		UNINSTALL_PLUGIN='&& rm -f ${DESTDIR}${plugindir}/$$i'
 		CLEAN_LIB=''
 		;;
-		solaris*)
+	*-*-solaris*)
 		AC_MSG_RESULT(Solaris)
 		LIB_CFLAGS='-fPIC -DPIC'
-			LIB_LDFLAGS='-shared -Wl,-soname=${SHARED_LIB}.${LIB_MAJOR}.${LIB_MINOR}'
+		LIB_LDFLAGS='-shared -Wl,-soname=$$out.${LIB_MAJOR}.${LIB_MINOR}'
 		LIB_LDFLAGS_INSTALL_NAME=''
 		LIB_PREFIX='lib'
 		LIB_SUFFIX='.so'
@@ -235,10 +251,10 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
 		UNINSTALL_PLUGIN='&& rm -f ${DESTDIR}${plugindir}/$$i'
 		CLEAN_LIB=''
 		;;
-		*-android*)
+	*-*-android*)
 		AC_MSG_RESULT(Android)
 		LIB_CFLAGS='-fPIC -DPIC'
-			LIB_LDFLAGS='-shared -Wl,-soname=${SHARED_LIB}.${LIB_MAJOR}'
+		LIB_LDFLAGS='-shared -Wl,-soname=$$out.${LIB_MAJOR}'
 		LIB_LDFLAGS_INSTALL_NAME=''
 		LIB_PREFIX='lib'
 		LIB_SUFFIX='.so'
@@ -253,10 +269,48 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
 		UNINSTALL_PLUGIN='&& rm -f ${DESTDIR}${plugindir}/$$i'
 		CLEAN_LIB=''
 		;;
+	hppa*-*-hpux*)
+		AC_MSG_RESULT([HP-UX (PA-RISC)])
+		LIB_CFLAGS='-fPIC -DPIC'
+		LIB_LDFLAGS='-shared -Wl,+h,$$out'
+		LIB_LDFLAGS_INSTALL_NAME=''
+		LIB_PREFIX='lib'
+		LIB_SUFFIX='.${LIB_MAJOR}'
+		LINK_LIB='&& rm -f $${out%%.*}.sl && ${LN_S} $$out $${out%%.*}.sl'
+		LDFLAGS_RPATH='-Wl,+b,${libdir}'
+		PLUGIN_CFLAGS='-fPIC -DPIC'
+		PLUGIN_LDFLAGS='-shared'
+		PLUGIN_SUFFIX='.sl'
+		LINK_PLUGIN='${LD} -o $$out ${PLUGIN_OBJS} ${PLUGIN_OBJS_EXTRA} ${PLUGIN_LDFLAGS} ${LDFLAGS} ${LIBS}'
+		INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i && ${LN_S} -f $$i ${DESTDIR}${libdir}/$${i%%.*}.sl'
+		UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$${i%%.*}.sl'
+		INSTALL_PLUGIN='&& ${INSTALL} -m 755 $$i ${DESTDIR}${plugindir}/$$i'
+		UNINSTALL_PLUGIN='&& rm -f ${DESTDIR}${plugindir}/$$i'
+		CLEAN_LIB=''
+		;;
+	ia64*-*-hpux*)
+		AC_MSG_RESULT([HP-UX (Itanium)])
+		LIB_CFLAGS='-fPIC -DPIC'
+		LIB_LDFLAGS='-shared -Wl,+h,$$out'
+		LIB_LDFLAGS_INSTALL_NAME=''
+		LIB_PREFIX='lib'
+		LIB_SUFFIX='.${LIB_MAJOR}'
+		LINK_LIB='&& rm -f $${out%%.*}.so && ${LN_S} $$out $${out%%.*}.so'
+		LDFLAGS_RPATH='-Wl,+b,${libdir}'
+		PLUGIN_CFLAGS='-fPIC -DPIC'
+		PLUGIN_LDFLAGS='-shared'
+		PLUGIN_SUFFIX='.so'
+		LINK_PLUGIN='${LD} -o $$out ${PLUGIN_OBJS} ${PLUGIN_OBJS_EXTRA} ${PLUGIN_LDFLAGS} ${LDFLAGS} ${LIBS}'
+		INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i && ${LN_S} -f $$i ${DESTDIR}${libdir}/$${i%%.*}.so'
+		UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$${i%%.*}.so'
+		INSTALL_PLUGIN='&& ${INSTALL} -m 755 $$i ${DESTDIR}${plugindir}/$$i'
+		UNINSTALL_PLUGIN='&& rm -f ${DESTDIR}${plugindir}/$$i'
+		CLEAN_LIB=''
+		;;
 	*)
 		AC_MSG_RESULT(ELF)
 		LIB_CFLAGS='-fPIC -DPIC'
-			LIB_LDFLAGS='-shared -Wl,-soname=${SHARED_LIB}.${LIB_MAJOR}'
+		LIB_LDFLAGS='-shared -Wl,-soname=$$out.${LIB_MAJOR}'
 		LIB_LDFLAGS_INSTALL_NAME=''
 		LIB_PREFIX='lib'
 		LIB_SUFFIX='.so'
@@ -278,6 +332,7 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
 	AC_SUBST(LIB_LDFLAGS_INSTALL_NAME)
 	AC_SUBST(LIB_PREFIX)
 	AC_SUBST(LIB_SUFFIX)
+	AC_SUBST(LINK_LIB)
 	AC_SUBST(LDFLAGS_RPATH)
 	AC_SUBST(PLUGIN_CFLAGS)
 	AC_SUBST(PLUGIN_LDFLAGS)

buildsys.mk.in

@@ -1,6 +1,6 @@
 #
 #  Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-#                2017, 2018, 2020
+#                2017, 2018, 2020, 2021
 #    Jonathan Schleifer <js@nil.im>
 #
 #  https://fossil.nil.im/buildsys
@@ -56,6 +56,7 @@ LIB_LDFLAGS = @LIB_LDFLAGS@
 LIB_LDFLAGS_INSTALL_NAME = @LIB_LDFLAGS_INSTALL_NAME@
 LIB_PREFIX = @LIB_PREFIX@
 LIB_SUFFIX = @LIB_SUFFIX@
+LINK_LIB = @LINK_LIB@
 AMIGA_LIB_CFLAGS = @AMIGA_LIB_CFLAGS@
 AMIGA_LIB_LDFLAGS = @AMIGA_LIB_LDFLAGS@
 PLUGIN_CFLAGS = @PLUGIN_CFLAGS@
@@ -149,7 +150,8 @@ ${SUBDIRS} ${SUBDIRS_AFTER}:
 
 depend: pre-depend
 	: >.deps
-	for i in ${DEPS}; do \
+	for i in "" ${DEPS}; do \
+		test x"$$i" = x"" && continue; \
 		echo "-include \$${.CURDIR}/$$i" >>.deps; \
 	done
 
@@ -183,7 +185,7 @@ ${JARFILE}: ${EXT_DEPS} ${JAR_MANIFEST} ${OBJS} ${OBJS_EXTRA}
 ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
 	${LINK_STATUS}
 	out="$@"; \
-	if ${LD} -o $@ ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${LIB_LDFLAGS} ${LIB_LDFLAGS_INSTALL_NAME} ${LDFLAGS} ${LIBS}; then \
+	if ${LD} -o $@ ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${LIB_LDFLAGS} ${LIB_LDFLAGS_INSTALL_NAME} ${LDFLAGS} ${LIBS} ${LINK_LIB}; then \
 		${LINK_OK}; \
 	else \
 		${LINK_FAILED}; \
@@ -886,7 +888,7 @@ clean:
 
 	: >.deps
 
-	for i in "" ${DEPS} ${OBJS} ${OBJS_EXTRA} ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${AMIGA_LIB_OBJS} ${AMIGA_LIB_OBJS_EXTRA} ${PLUGIN_OBJS} ${PROG} ${PROG_NOINST} ${SHARED_LIB} ${SHARED_LIB_NOINST} ${AMIGA_LIB} ${AMIGA_LIB_NOINST} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${STATIC_AMIGA_LIB} ${STATIC_AMIGA_LIB_NOINST} ${FRAMEWORK} ${PLUGIN} ${PLUGIN_NOINST} ${CLEAN_LIB} ${MO_FILES} ${CLEAN}; do \
+	for i in "" ${DEPS} ${OBJS} ${OBJS_EXTRA} ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${AMIGA_LIB_OBJS} ${AMIGA_LIB_OBJS_START} ${AMIGA_LIB_OBJS_EXTRA} ${PLUGIN_OBJS} ${PROG} ${PROG_NOINST} ${SHARED_LIB} ${SHARED_LIB_NOINST} ${AMIGA_LIB} ${AMIGA_LIB_NOINST} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${STATIC_AMIGA_LIB} ${STATIC_AMIGA_LIB_NOINST} ${FRAMEWORK} ${PLUGIN} ${PLUGIN_NOINST} ${CLEAN_LIB} ${MO_FILES} ${CLEAN}; do \
 		test x"$$i" = x"" && continue; \
 		if test -f $$i -o -d $$i; then \
 			if rm -fr $$i; then \