staging.patch

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