summaryrefslogtreecommitdiff
path: root/mcon/U/install.U
diff options
context:
space:
mode:
Diffstat (limited to 'mcon/U/install.U')
-rw-r--r--mcon/U/install.U17
1 files changed, 11 insertions, 6 deletions
diff --git a/mcon/U/install.U b/mcon/U/install.U
index dae29a3..dc8880c 100644
--- a/mcon/U/install.U
+++ b/mcon/U/install.U
@@ -1,11 +1,11 @@
-?RCS: $Id: install.U 1 2006-08-24 12:32:52Z rmanfredi $
+?RCS: $Id: install.U 167 2013-05-08 17:58:00Z rmanfredi $
?RCS:
?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi
?RCS:
-?RCS: You may redistribute only under the terms of the Artistic Licence,
+?RCS: You may redistribute only under the terms of the Artistic License,
?RCS: as specified in the README file that comes with the distribution.
?RCS: You may reuse parts of this distribution only within the terms of
-?RCS: that same Artistic Licence; a copy of which may be found at the root
+?RCS: that same Artistic License; a copy of which may be found at the root
?RCS: of the source tree for dist 4.0.
?RCS:
?RCS: $Log: install.U,v $
@@ -16,7 +16,7 @@
?RCS: patch45: created
?RCS:
?MAKE:install installdir: Loc Oldconfig Getfile cat test startsh rm +cc \
- eunicefix package contains mkdir echo n c
+ eunicefix package contains mkdir echo n c awk wc
?MAKE: -pick add $@ %<
?S:install:
?S: This variable contains the name of an install program that can accept
@@ -35,7 +35,7 @@
?S: resort, setting the variable to './install -d'. Otherwise, it is set to
?S: plain 'mkdir', and cross your fingers!
?S:.
-?T:dir file tryit prog creatdir either
+?T:dir file tryit prog creatdir either try_wc d_try_wc tryns_wc d_tryns_wc
?F:!tryinst
: locate a BSD compatible install program
echo " "
@@ -91,7 +91,12 @@ EOS
fi
@end
(ls -l d/try >try.ls; ls -l d/try.ns >tryno.ls) 2>/dev/null
- if (cmp -s d/try try && cmp -s d/try.ns try.ns && \
+ try_wc=`($wc -c try | $awk '{ print $1}') 2>/dev/null`
+ tryns_wc=`($wc -c try.ns | $awk '{ print $1}') 2>/dev/null`
+ d_try_wc=`($wc -c d/try | $awk '{ print $1}') 2>/dev/null`
+ d_tryns_wc=`($wc -c d/try.ns | $awk '{ print $1}') 2>/dev/null`
+ if ($test "X$try_wc" = "X$d_try_wc" && \
+ $test "X$tryns_wc" = "X$d_tryns_wc" && \
$contains 'rwxrw-r--' tryno.ls && \
$contains 'rw-r---w-' try.ls) >/dev/null 2>&1
then