[pkgsrc/trunk]: pkgsrc/mk/install Avoid double // in the case where PREFIX is...

[abs <abs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f3bf04ab6ca9
branches:  trunk
changeset: 498460:f3bf04ab6ca9
user:      abs <abs%pkgsrc.org@localhost>
date:      Tue Aug 23 09:33:14 2005 +0000

description:
Avoid double // in the case where PREFIX is / (eg: shells/standalone-tcsh)

diffstat:

 mk/install/shell |  26 +++++++++++++++++++++-----
 1 files changed, 21 insertions(+), 5 deletions(-)

diffs (63 lines):

diff -r 3d4ea79798c3 -r f3bf04ab6ca9 mk/install/shell
--- a/mk/install/shell  Tue Aug 23 09:29:06 2005 +0000
+++ b/mk/install/shell  Tue Aug 23 09:33:14 2005 +0000
@@ -1,6 +1,6 @@
 #!@SH@
 #
-# $NetBSD: shell,v 1.2 2005/08/19 22:24:10 jlam Exp $
+# $NetBSD: shell,v 1.3 2005/08/23 09:33:14 abs Exp $
 #
 # +SHELL - shell registration script
 #
@@ -62,7 +62,11 @@
                esac
                case $shell in
                /*)     continue ;;
-               *)      shell="${PKG_PREFIX}/$shell" ;;
+               *)      if [ ${PKG_PREFIX} = / ] ; then
+                               shell="/$shell"
+                       else
+                               shell="${PKG_PREFIX}/$shell"
+                       fi ;;
                esac
                ${TEST} -f "$shell" || continue
 
@@ -101,7 +105,11 @@
                esac
                case $shell in
                /*)     continue ;;
-               *)      shell="${PKG_PREFIX}/$shell" ;;
+               *)      if [ ${PKG_PREFIX} = / ] ; then
+                               shell="/$shell"
+                       else
+                               shell="${PKG_PREFIX}/$shell"
+                       fi ;;
                esac
                ${TEST} -f "$shell" || continue
 
@@ -135,7 +143,11 @@
        { while read shell; do
                case $shell in
                /*)     continue ;;
-               *)      shell="${PKG_PREFIX}/$shell" ;;
+               *)      if [ ${PKG_PREFIX} = / ] ; then
+                               shell="/$shell"
+                       else
+                               shell="${PKG_PREFIX}/$shell"
+                       fi ;;
                esac
                ${TEST} -f "$shell" || continue
 
@@ -169,7 +181,11 @@
        { while read shell; do
                case $shell in
                /*)     continue ;;
-               *)      shell="${PKG_PREFIX}/$shell" ;;
+               *)      if [ ${PKG_PREFIX} = / ] ; then
+                               shell="/$shell"
+                       else
+                               shell="${PKG_PREFIX}/$shell"
+                       fi ;;
                esac
                ${TEST} -f "$shell" || continue