staging.patch

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