staging.patch

   1 diff --git a/package/stage b/package/stage
   2 index 367831d..35dc39f 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 @@ -77,39 +77,39 @@ do
  28
  29         if test -s package/nosh-"$i".commands1 || test -s package/nosh-"$i".aliases1
  30         then
  31 -               install -d -m 0755 -- "${dest}"/nosh-"${i}"/"${binprefix}"/bin
  32 +               install -d -m 0755 -- "${dest}"/nosh-"${i}"/"${binprefix}"/bin
  33         fi
  34         if test -s package/nosh-"$i".commands1
  35         then
  36                 while read -r j
  37                 do
  38 -                       ln -f -- "${src}"/command/"$j" "${dest}"/nosh-"${i}"/"${binprefix}"/bin/
  39 +                       ln -f -- "${src}"/command/"$j" "${dest}"/nosh-"${i}"/"${binprefix}"/bin/
  40                 done < package/nosh-"$i".commands1
  41         fi
  42         if test -s package/nosh-"$i".aliases1
  43         then
  44                 while read -r c a
  45                 do
  46 -                       ln -f -s "$c" "${dest}"/nosh-"${i}"/"${binprefix}"/bin/"$a"
  47 +                       ln -f -s "$c" "${dest}"/nosh-"${i}"/"${binprefix}"/bin/"$a"
  48                 done < package/nosh-"$i".aliases1
  49         fi
  50
  51         if test -s package/nosh-"$i".commands8 || test -s package/nosh-"$i".aliases8
  52         then
  53 -               install -d -m 0755 -- "${dest}"/nosh-"${i}"/"${binprefix}"/sbin
  54 +               install -d -m 0755 -- "${dest}"/nosh-"${i}"/"${binprefix}"/bin
  55         fi
  56         if test -s package/nosh-"$i".commands8
  57         then
  58                 while read -r j
  59                 do
  60 -                       ln -f -- "${src}"/command/"$j" "${dest}"/nosh-"${i}"/"${binprefix}"/sbin/
  61 +                       ln -f -- "${src}"/command/"$j" "${dest}"/nosh-"${i}"/"${binprefix}"/bin/
  62                 done < package/nosh-"$i".commands8
  63         fi
  64         if test -s package/nosh-"$i".aliases8
  65         then
  66                 while read -r c a
  67                 do
  68 -                       ln -f -s "$c" "${dest}"/nosh-"${i}"/"${binprefix}"/sbin/"$a"
  69 +                       ln -f -s "$c" "${dest}"/nosh-"${i}"/"${binprefix}"/bin/"$a"
  70                 done < package/nosh-"$i".aliases8
  71         fi
  72
  73 @@ -165,13 +165,13 @@ fi
  74  if test -n "${dbusprefix}"
  75  then
  76         install -d -m 0755 -- "${dest}"/nosh-desktop-bus-shims/"${dbusprefix}"
  77 -       ln -f -s /usr/local/bin/dbus-daemon-launch-helper "${dest}"/nosh-desktop-bus-shims/"${dbusprefix}"/
  78 +       ln -f -s /usr/bin/dbus-daemon-launch-helper "${dest}"/nosh-desktop-bus-shims/"${dbusprefix}"/
  79  fi
  80  install -d -m 0755 -- "${dest}"/nosh-run-system-manager/
  81  case "`uname`" in
  82  Linux)
  83 -       install -d -m 0755 -- "${dest}"/nosh-run-system-manager/sbin
  84 -       ln -f -s system-manager "${dest}"/nosh-run-system-manager/sbin/init
  85 +       install -d -m 0755 -- "${dest}"/nosh-run-system-manager/usr/bin
  86 +       ln -f -s system-manager "${dest}"/nosh-run-system-manager/usr/bin/init
  87         if test _"${binprefix}" != _"/usr"
  88         then
  89                 install -d -m 0755 -- "${dest}"/nosh-bcron-as-cron-shims/usr/bin