staging.patch

   1 diff --git a/package/stage b/package/stage
   2 index b9a0082..38d9b29 100755
   3 --- a/package/stage
   4 +++ b/package/stage
   5 @@ -19,15 +19,15 @@ absdest="`readlink -f "${dest}"`/"
   6  # distributor patchable stuff
   7
   8  # Eventually, these will be /usr .
   9 -binprefix="/usr/local"
  10 -libprefix="/usr/local"
  11 +binprefix="/usr"
  12 +libprefix="/usr"
  13  # Eventually, these will be /usr/share .
  14 -manprefix="/usr/local"
  15 -docprefix="/usr/local/share"
  16 +manprefix="/usr/share"
  17 +docprefix="/usr/share"
  18  # Eventually, this will be / .
  19 -etcprefix="/usr/local"
  20 +etcprefix="/"
  21  # Eventually, this will be /usr/share .
  22 -prsprefix="/usr/local/etc"
  23 +prsprefix="/usr/share"
  24
  25  # Set this to blank or unset it if /usr/{s,}bin and /{s,}bin are identical.
  26  case "`uname`" in
  27 @@ -73,24 +73,24 @@ do
  28
  29         if test -s package/nosh-"$i".commands8 || test -s package/nosh-"$i".aliases8 ;
  30         then
  31 -               install -d -m 0755 -- "${dest}"/nosh-"${i}"/"${binprefix}"/sbin
  32 +               install -d -m 0755 -- "${dest}"/nosh-"${i}"/"${binprefix}"/bin
  33                 install -d -m 0755 -- "${dest}"/nosh-"${i}"/"${manprefix}"/man/man8
  34         fi
  35         while read j ;
  36         do
  37 -               ln -f -- "${src}"/command/"$j" "${dest}"/nosh-"${i}"/"${binprefix}"/sbin/
  38 +               ln -f -- "${src}"/command/"$j" "${dest}"/nosh-"${i}"/"${binprefix}"/bin/
  39                 ln -f -- "${src}"/manual/"$j".8 "${dest}"/nosh-"${i}"/"${manprefix}"/man/man8/
  40         done < package/nosh-"$i".commands8 ;
  41
  42         while read c a ;
  43         do
  44 -               ln -f -s "$c" "${dest}"/nosh-"${i}"/"${binprefix}"/bin/"$a"
  45 +               ln -f -s "$c" "${dest}"/nosh-"${i}"/"${binprefix}"/bin/"$a"
  46                 ln -f -s "$c".1 "${dest}"/nosh-"${i}"/"${manprefix}"/man/man1/"$a".1
  47         done < package/nosh-"$i".aliases1 ;
  48
  49         while read c a ;
  50         do
  51 -               ln -f -s "$c" "${dest}"/nosh-"${i}"/"${binprefix}"/sbin/"$a"
  52 +               ln -f -s "$c" "${dest}"/nosh-"${i}"/"${binprefix}"/bin/"$a"
  53                 ln -f -s "$c".8 "${dest}"/nosh-"${i}"/"${manprefix}"/man/man8/"$a".8
  54         done < package/nosh-"$i".aliases8 ;
  55  done
  56 @@ -127,8 +127,8 @@ fi
  57  install -d -m 0755 -- "${dest}"/nosh-run-system-manager/
  58  case "`uname`" in
  59  Linux)
  60 -       install -d -m 0755 -- "${dest}"/nosh-run-system-manager/sbin
  61 -       ln -f -s system-manager "${dest}"/nosh-run-system-manager/sbin/init
  62 +       install -d -m 0755 -- "${dest}"/nosh-run-system-manager/usr/bin
  63 +       ln -f -s system-manager "${dest}"/nosh-run-system-manager/usr/bin/init
  64         ;;
  65  *BSD)  ;;
  66  esac