ossp-pkg/shtool/sh.mkln 1.20 -> 1.21
--- sh.mkln 2006/02/04 09:43:25 1.20
+++ sh.mkln 2007/05/15 19:35:48 1.21
@@ -131,12 +131,17 @@
# determine source prefix which is the reverse directory
# step-up corresponding to the destination directory
srcpre=""
-
- isroot=0
- if [ ".$prefix" = . ] || [ ".$prefix" = ./ ]; then
- isroot=1
- fi
- if [ $oneisabs = 0 ] || [ $isroot = 0 ]; then
+ allow_relative_srcpre=no
+ if [ ".$prefix" != . ] && [ ".$prefix" != ./ ]; then
+ allow_relative_srcpre=yes
+ fi
+ if [ $oneisabs = 0 ]; then
+ allow_relative_srcpre=yes
+ fi
+ if [ ".$opt_s" != .yes ]; then
+ allow_relative_srcpre=no
+ fi
+ if [ ".$allow_relative_srcpre" = .yes ]; then
pl="$dstdir/"
OIFS="$IFS"; IFS='/'
for pe in $pl; do
|
|
