portbunny/installpath.patch

   1 diff -Nur PortBunny050109-dev/Makefile PortBunny050109-dev-arch/Makefile
   2 --- PortBunny050109-dev/Makefile        2009-01-05 14:21:47.000000000 +0100
   3 +++ PortBunny050109-dev-arch/Makefile   2009-01-14 22:38:49.300678488 +0100
   4 @@ -49,5 +49,5 @@
   5
   6  install:
   7
   8 -       $(shell install -m 644 portbunny.ko /lib/modules/$(shell uname -r)/kernel/portbunny.ko; /sbin/depmod -a)
   9 -       $(shell cp -r ./UI/* /usr/local/)
  10 +       install -m 644 portbunny.ko ${DESTDIR}/lib/modules/$(shell uname -r)/kernel/portbunny.ko
  11 +       cp -r ./UI/* ${DESTDIR}/usr/
  12 diff -Nur PortBunny050109-dev/UI/bin/portbunny PortBunny050109-dev-arch/UI/bin/portbunny
  13 --- PortBunny050109-dev/UI/bin/portbunny        2008-10-26 08:41:32.000000000 +0100
  14 +++ PortBunny050109-dev-arch/UI/bin/portbunny   2009-01-14 22:38:13.567338951 +0100
  15 @@ -12,7 +12,7 @@
  16
  17
  18  PBUNNY_SHARE = '../share/portbunny/'
  19 -PBUNNY_SHARE2 = '/usr/local/share/portbunny/'
  20 +PBUNNY_SHARE2 = '/usr/share/portbunny/'
  21
  22  import sys
  23  import time
  24 diff -Nur PortBunny050109-dev/UI/bin/portbunny.py PortBunny050109-dev-arch/UI/bin/portbunny.py
  25 --- PortBunny050109-dev/UI/bin/portbunny.py     2008-10-26 08:41:32.000000000 +0100
  26 +++ PortBunny050109-dev-arch/UI/bin/portbunny.py        2009-01-14 22:38:13.567338951 +0100
  27 @@ -12,7 +12,7 @@
  28
  29
  30  PBUNNY_SHARE = '../share/portbunny/'
  31 -PBUNNY_SHARE2 = '/usr/local/share/portbunny/'
  32 +PBUNNY_SHARE2 = '/usr/share/portbunny/'
  33
  34  import sys
  35  import time
  36 diff -Nur PortBunny050109-dev/UI/share/portbunny/PBunnyServices.py PortBunny050109-dev-arch/UI/share/portbunny/PBunnyServices.py
  37 --- PortBunny050109-dev/UI/share/portbunny/PBunnyServices.py    2008-10-26 08:41:32.000000000 +0100
  38 +++ PortBunny050109-dev-arch/UI/share/portbunny/PBunnyServices.py       2009-01-14 22:38:25.061728150 +0100
  39 @@ -7,7 +7,7 @@
  40
  41  ETC_SERVICES = '../share/portbunny/services'
  42  if not os.path.exists(ETC_SERVICES):
  43 -    ETC_SERVICES = '/usr/local/share/portbunny/services'
  44 +    ETC_SERVICES = '/usr/share/portbunny/services'
  45
  46
  47  """
  48 diff -Nur PortBunny050109-dev/scanner_ui/scanner_ui.c PortBunny050109-dev-arch/scanner_ui/scanner_ui.c
  49 --- PortBunny050109-dev/scanner_ui/scanner_ui.c 2008-10-26 08:41:30.000000000 +0100
  50 +++ PortBunny050109-dev-arch/scanner_ui/scanner_ui.c    2009-01-14 22:37:59.164038548 +0100
  51 @@ -344,7 +344,7 @@
  52  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12)
  53
  54  #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25)
  55 -               device_create_drvdata(portbunny_class, NULL, MKDEV(major, 0), NULL, "portbunny");
  56 +               device_create(portbunny_class, NULL, MKDEV(major, 0), NULL, "portbunny");
  57  #else
  58                 class_device_create(portbunny_class, NULL, MKDEV(major, 0), NULL, "portbunny");
  59  #endif