ossp-pkg/shtool/sh.slo 1.21 -> 1.22
--- sh.slo 2003/04/29 08:01:01 1.21
+++ sh.slo 2003/08/13 14:20:34 1.22
@@ -43,7 +43,7 @@
optprev=''
fi
# remember options for arg if used stand-alone
- if [ ".$opt" = ".-L" -o ".$opt" = ".-l" ]; then
+ if [ ".$opt" = ".-L" ] || [ ".$opt" = ".-l" ]; then
optprev="$opt"
continue;
fi
@@ -122,9 +122,10 @@
if [ ".$found" = .yes ]; then
if [ ".$found_indefdir" != .yes ]; then
eval "dirlist=\"\${DIRS_${found_type}}:\""
- if [ ".`echo \"$dirlist\" | fgrep :$found_dir:`" = . ]; then
- eval "DIRS_${found_type}=\"\$DIRS_${found_type}:${found_dir}\""
- fi
+ case "$dirlist" in
+ *:$found_dir:* ) ;;
+ * ) eval "DIRS_${found_type}=\"\$DIRS_${found_type}:${found_dir}\"" ;;
+ esac
eval "LIBS_${found_type}=\"\$LIBS_${found_type}:$lib\""
else
eval "LIBS_${found_type}=\"\$LIBS_${found_type}:$lib\""
@@ -142,9 +143,10 @@
OIFS="$IFS"; IFS=':'
for dir in $DIRS; do
dirlist="${DIRS_OBJ}:${DIRS_PIC}:${DIRS_DSO}:"
- if [ ".`echo \"$dirlist\" | fgrep :$dir:`" = . ]; then
- DIRS_OBJ="$DIRS_OBJ:$dir"
- fi
+ case "$dirlist" in
+ *:$dir:* ) ;;
+ * ) DIRS_OBJ="$DIRS_OBJ:$dir" ;;
+ esac
done
IFS="$OIFS"
|
|
