Advertisement
Guest User

Untitled

a guest
Feb 13th, 2015
227
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.87 KB | None | 0 0
  1. --- drivers/Makefile.am 2012-01-20 17:15:36.510333562 +0400
  2. +++ drivers_new/Makefile.am 2012-01-20 16:53:01.000000000 +0400
  3. @@ -28,11 +28,10 @@
  4. CC="$(LINUX_CC) -I@abs_top_srcdir@ -I@abs_top_srcdir@/drivers/gpib/include -I@abs_top_srcdir@/include" \
  5. SUBDIRS="$(GPIB_ABS_MODULE_SUBDIR)"
  6.  
  7. -install-data-hook: device-file-check /etc/gpib.conf
  8. +install-data-hook: /etc/gpib.conf
  9. $(MAKE) -C $(LINUX_SRCDIR) V=1 modules_install\
  10. CC="$(LINUX_CC) -I@abs_top_srcdir@ -I@abs_top_srcdir@/driver/include -I@abs_top_srcdir@/include" \
  11. SUBDIRS="$(GPIB_ABS_MODULE_SUBDIR)" INSTALL_MOD_DIR="gpib"
  12. - $(DEPMOD) -a
  13.  
  14. /dev/gpib0:
  15. groupadd gpib || echo "group gpib exists"
  16. @@ -60,7 +60,7 @@
  17.  
  18. #should move this to util/templates Makefile.am when it exists
  19. /etc/gpib.conf:
  20. - $(INSTALL_DATA) -D $(top_srcdir)/util/templates/gpib.conf /etc/gpib.conf
  21. + $(INSTALL_DATA) -D $(top_srcdir)/util/templates/gpib.conf $(DESTDIR)/etc/gpib.conf
  22.  
  23. #make sure compiled files, etc don't make it into distribution tarballs
  24. dist-hook:
  25. --- usb/agilent_82357a/Makefile.am 2012-01-20 17:15:27.900333912 +0400
  26. +++ usb_new/agilent_82357a/Makefile.am 2012-01-20 17:10:56.000000000 +0400
  27. @@ -13,7 +13,7 @@
  28. USB_FIRMWARE_DIR=/usr/share/usb/
  29.  
  30. install-data-local:
  31. - test -e $(HOTPLUG_USB_CONF_DIR)/agilent_82357a || $(INSTALL_SCRIPT) -D agilent_82357a $(HOTPLUG_USB_CONF_DIR)/agilent_82357a
  32. - test -e $(HOTPLUG_USB_CONF_DIR)/agilent_82357a.usermap || $(INSTALL_DATA) -D agilent_82357a.usermap $(HOTPLUG_USB_CONF_DIR)/agilent_82357a.usermap
  33. - $(INSTALL) -d $(USB_FIRMWARE_DIR)/agilent_82357a
  34. + test -e $(DESTDIR)/$(HOTPLUG_USB_CONF_DIR)/agilent_82357a || $(INSTALL_SCRIPT) -D agilent_82357a $(DESTDIR)/$(HOTPLUG_USB_CONF_DIR)/agilent_82357a
  35. + test -e $(DESTDIR)/$(HOTPLUG_USB_CONF_DIR)/agilent_82357a.usermap || $(INSTALL_DATA) -D agilent_82357a.usermap $(DESTDIR)/$(HOTPLUG_USB_CONF_DIR)/agilent_82357a.usermap
  36. + $(INSTALL) -d $(DESTDIR)/$(USB_FIRMWARE_DIR)/agilent_82357a
  37.  
  38. --- usb/ni_usb_gpib/Makefile.am 2012-01-20 17:15:27.897000580 +0400
  39. +++ usb_new/ni_usb_gpib/Makefile.am 2012-01-20 17:12:39.000000000 +0400
  40. @@ -13,7 +13,7 @@
  41. USB_FIRMWARE_DIR=/usr/share/usb/
  42.  
  43. install-data-local:
  44. - test -e $(HOTPLUG_USB_CONF_DIR)/ni_usb_gpib || $(INSTALL_SCRIPT) -D ni_usb_gpib $(HOTPLUG_USB_CONF_DIR)/ni_usb_gpib
  45. - test -e $(HOTPLUG_USB_CONF_DIR)/ni_usb_gpib.usermap || $(INSTALL_DATA) -D ni_usb_gpib.usermap $(HOTPLUG_USB_CONF_DIR)/ni_usb_gpib.usermap
  46. - $(INSTALL) -d $(USB_FIRMWARE_DIR)/ni_usb_gpib
  47. + test -e $(DESTDIR)/$(HOTPLUG_USB_CONF_DIR)/ni_usb_gpib || $(INSTALL_SCRIPT) -D ni_usb_gpib $(DESTDIR)/$(HOTPLUG_USB_CONF_DIR)/ni_usb_gpib
  48. + test -e $(DESTDIR)/$(HOTPLUG_USB_CONF_DIR)/ni_usb_gpib.usermap || $(INSTALL_DATA) -D ni_usb_gpib.usermap $(DESTDIR)/$(HOTPLUG_USB_CONF_DIR)/ni_usb_gpib.usermap
  49. + $(INSTALL) -d $(DESTDIR)/$(USB_FIRMWARE_DIR)/ni_usb_gpib
  50.  
  51. \ В конце файла нет новой строки
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement