[w3m-dev 04068] install-sh problem

[w3m-dev 04069] install-sh problem 2
* Makefile.in (MAKE_ARGS): delete INSTALL
* install-sh: replace with X Consortium install-sh (from automake)
From: SAKAI Kiyotaka <ksakai@kso.netwk.ntt-at.co.jp>

ChangeLog

@@ -1,3 +1,10 @@
+2004-04-27  SAKAI Kiyotaka <ksakai@kso.netwk.ntt-at.co.jp>
+
+	* [w3m-dev 04068] install-sh problem
+	 [w3m-dev 04069] install-sh problem 2
+	* Makefile.in (MAKE_ARGS): delete INSTALL
+	* install-sh: replace with X Consortium install-sh (from automake)
+
 2004-04-27  Fumitoshi UKAI  <ukai@debian.or.jp>
 
 	* [w3m-dev 04073] Re: run configure in another directory
@@ -8466,4 +8473,4 @@ a	* [w3m-dev 03276] compile error on EWS4800
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.922 2004/04/26 17:00:37 ukai Exp $
+$Id: ChangeLog,v 1.923 2004/04/26 17:04:47 ukai Exp $

Makefile.in

@@ -49,7 +49,7 @@ W3M_LIBS = @W3M_LIBS@
 WCTARGET = @WCTARGET@
 NLSTARGET = @NLSTARGET@
 
-MAKE_ARGS = PERL='$(PERL)' MKDIR='$(MKDIR)' INSTALL='$(INSTALL)' \
+MAKE_ARGS = PERL='$(PERL)' MKDIR='$(MKDIR)' \
 	BIN_DIR='$(bindir)' AUXBIN_DIR='$(AUXBIN_DIR)' \
 	CGIBIN_DIR='$(CGIBIN_DIR)' \
 	HELP_DIR='$(HELP_DIR)' MAN_DIR='$(mandir)' ETC_DIR='$(ETC_DIR)' \

install-sh

@@ -1,62 +1,269 @@
-#! /bin/sh
+#!/bin/sh
-# $Id: install-sh,v 1.6 2002/11/06 15:09:16 ukai Exp $
+#
+# install - install a program, script, or datafile
+#
+# 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
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# 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
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.  It can only install one file at a time, a restriction
+# shared with many OS's install programs.
 
-set -e
 
-while :
+# set DOITPROG to echo to test this script
-do
+
-  case $1 in
+# Don't use :- since 4.3BSD and earlier shells don't like it.
-  -m)
+doit="${DOITPROG-}"
-    mode=$2
+
-    shift; shift
+
-    ;;
+# put in absolute paths if you don't have them in your path; or use env. vars.
-  -s)
+
-    if [ -n "$STRIP" ]; then
+mvprog="${MVPROG-mv}"
-      strip=$STRIP
+cpprog="${CPPROG-cp}"
-    else
+chmodprog="${CHMODPROG-chmod}"
-      strip=strip
+chownprog="${CHOWNPROG-chown}"
-    fi
+chgrpprog="${CHGRPPROG-chgrp}"
-    shift;
+stripprog="${STRIPPROG-strip}"
-    ;;
+rmprog="${RMPROG-rm}"
-  -o) owner=$2
+mkdirprog="${MKDIRPROG-mkdir}"
-      shift; shift
+
-      ;;
+transformbasename=""
-  -g) group=$2
+transform_arg=""
-      shift; shift
+instcmd="$mvprog"
-      ;;
+chmodcmd="$chmodprog 0755"
-  -*)
+chowncmd=""
-    shift
+chgrpcmd=""
-    ;;
+stripcmd=""
-  *)
+rmcmd="$rmprog -f"
-    break
+mvcmd="$mvprog"
-  esac
+src=""
+dst=""
+dir_arg=""
+
+while [ x"$1" != x ]; do
+    case $1 in
+	-c) instcmd="$cpprog"
+	    shift
+	    continue;;
+
+	-d) dir_arg=true
+	    shift
+	    continue;;
+
+	-m) chmodcmd="$chmodprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-o) chowncmd="$chownprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-g) chgrpcmd="$chgrpprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-s) stripcmd="$stripprog"
+	    shift
+	    continue;;
+
+	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
+	    shift
+	    continue;;
+
+	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+	    shift
+	    continue;;
+
+	*)  if [ x"$src" = x ]
+	    then
+		src=$1
+	    else
+		# this colon is to work around a 386BSD /bin/sh bug
+		:
+		dst=$1
+	    fi
+	    shift
+	    continue;;
+    esac
 done
 
-if [ $# -lt 2 ]; then
+if [ x"$src" = x ]
-  echo "usage: $0 [-m mode] [-s] file1 file2"
+then
-  exit 1
+	echo "install:	no input file specified"
-fi
+	exit 1
-
-file=$1
-if [ -d $2 ]; then
-  dest=$2/$file
 else
-  dest=$2
+	true
 fi
 
-if [ -f $dest ]; then
+if [ x"$dir_arg" != x ]; then
-  rm -f $dest
+	dst=$src
+	src=""
+	
+	if [ -d $dst ]; then
+		instcmd=:
+		chmodcmd=""
+	else
+		instcmd=mkdir
+	fi
+else
+
+# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+# might cause directories to be created, which would be especially bad 
+# if $src (and thus $dsttmp) contains '*'.
+
+	if [ -f $src -o -d $src ]
+	then
+		true
+	else
+		echo "install:  $src does not exist"
+		exit 1
+	fi
+	
+	if [ x"$dst" = x ]
+	then
+		echo "install:	no destination specified"
+		exit 1
+	else
+		true
+	fi
+
+# 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 ]
+	then
+		dst="$dst"/`basename $src`
+	else
+		true
+	fi
 fi
-cp $file $dest
+
-if [ -n "$strip" ]; then
+## this sed command emulates the dirname command
-  $strip $dest
+dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-fi
+
-if [ -n "$owner" ]; then
+# Make sure that the destination directory exists.
-  chown $owner $dest
+#  this part is taken from Noah Friedman's mkinstalldirs script
-fi
+
-if [ -n "$group" ]; then
+# Skip lots of stat calls in the usual case.
-  chgrp $group $dest
+if [ ! -d "$dstdir" ]; then
-fi
+defaultIFS=' 	
-if [ -n "$mode" ]; then
+'
-  chmod $mode $dest
+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
+
+	if [ ! -d "${pathcomp}" ] ;
+        then
+		$mkdirprog "${pathcomp}"
+	else
+		true
+	fi
+
+	pathcomp="${pathcomp}/"
+done
 fi
+
+if [ x"$dir_arg" != x ]
+then
+	$doit $instcmd $dst &&
+
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
+else
+
+# If we're going to rename the final executable, determine the name now.
+
+	if [ x"$transformarg" = x ] 
+	then
+		dstfile=`basename $dst`
+	else
+		dstfile=`basename $dst $transformbasename | 
+			sed $transformarg`$transformbasename
+	fi
+
+# don't allow the sed command to completely eliminate the filename
+
+	if [ x"$dstfile" = x ] 
+	then
+		dstfile=`basename $dst`
+	else
+		true
+	fi
+
+# Make a temp file name in the proper directory.
+
+	dsttmp=$dstdir/#inst.$$#
+
+# Move or copy the file name to the temp name
+
+	$doit $instcmd $src $dsttmp &&
+
+	trap "rm -f ${dsttmp}" 0 &&
+
+# 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 $instcmd $src $dsttmp" command.
+
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
+
+# Now rename the file to the real destination.
+
+	$doit $rmcmd -f $dstdir/$dstfile &&
+	$doit $mvcmd $dsttmp $dstdir/$dstfile 
+
+fi &&
+
+
+exit 0