aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFumitoshi UKAI <ukai@debian.or.jp>2001-12-15 17:25:45 +0000
committerFumitoshi UKAI <ukai@debian.or.jp>2001-12-15 17:25:45 +0000
commit7d210d5c99c05ef1278958ba40f15f1c58c5fed6 (patch)
tree1f8e6604febba17fdf7ba877883447a191840816
parent[w3m-dev 02663] fix prevA() cause loop (diff)
downloadw3m-7d210d5c99c05ef1278958ba40f15f1c58c5fed6.tar.gz
w3m-7d210d5c99c05ef1278958ba40f15f1c58c5fed6.zip
[w3m-dev 02664] install-sh -s option
From: Rin Okuyama <okuyama@cna.ne.jp>
-rw-r--r--ChangeLog8
-rw-r--r--XMakefile4
-rwxr-xr-xinstall-sh27
3 files changed, 28 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 7922ec3..2505670 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-16 Rin Okuyama <okuyama@cna.ne.jp>
+
+ * [w3m-dev 02664] install-sh -s option
+ * XMakefile: install-sh -s
+ * install-sh: support strip option
+
2001-12-15 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 02663] fix prevA() cause loop
@@ -1250,4 +1256,4 @@
* release-0-2-1
* import w3m-0.2.1
-$Id: ChangeLog,v 1.129 2001/12/14 17:58:40 ukai Exp $
+$Id: ChangeLog,v 1.130 2001/12/15 17:25:45 ukai Exp $
diff --git a/XMakefile b/XMakefile
index 9dbdd48..b891546 100644
--- a/XMakefile
+++ b/XMakefile
@@ -1,4 +1,4 @@
-# $Id: XMakefile,v 1.17 2001/12/14 17:10:54 ukai Exp $
+# $Id: XMakefile,v 1.18 2001/12/15 17:25:45 ukai Exp $
SRCS=main.c file.c buffer.c display.c etc.c search.c linein.c table.c local.c \
form.c map.c frame.c rc.c menu.c mailcap.c\
func.c cookie.c history.c backend.c $(KEYBIND_SRC)
@@ -32,7 +32,7 @@ CFLAGS=$(OPTS) $(MYCFLAGS) $(DEFS)
LIBS=-L. -lindep $(GCLIB) $(MATHLIB) $(LOCAL_LIBRARIES) $(SYS_LIBRARIES)
LIBS2=-L. -lindep $(GCLIB) $(LOCAL_LIBRARIES)
INSTALL=sh install-sh
-INSTALL_PROGRAM=$(INSTALL) -m 755
+INSTALL_PROGRAM=$(INSTALL) -m 755 -s
INSTALL_SCRIPT=$(INSTALL) -m 755
INSTALL_DATA=$(INSTALL) -m 644
AR=ar
diff --git a/install-sh b/install-sh
index 402ea72..a2a1052 100755
--- a/install-sh
+++ b/install-sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: install-sh,v 1.1 2001/12/06 15:36:55 ukai Exp $
+# $Id: install-sh,v 1.2 2001/12/15 17:25:45 ukai Exp $
while :
do
@@ -8,6 +8,14 @@ do
mode=$2
shift; shift
;;
+ -s)
+ if [ -n "$STRIP" ]; then
+ strip=$STRIP
+ else
+ strip=strip
+ fi
+ shift;
+ ;;
-*)
shift
;;
@@ -17,18 +25,21 @@ do
done
if [ $# -lt 2 ]; then
- echo "usage: $0 [-m mode] file1 file2"
+ echo "usage: $0 [-m mode] [-s] file1 file2"
exit 1
fi
file=$1
-dest=$2
+if [ -d $2 ]; then
+ dest=$2/$file
+else
+ dest=$2
+fi
cp $file $dest
+if [ -n "$strip" ]; then
+ $strip $dest
+fi
if [ -n "$mode" ]; then
- if [ -d $dest ]; then
- chmod $mode $dest/$file
- else
- chmod $mode $dest
- fi
+ chmod $mode $dest
fi