Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- --- drivers/Makefile.am 2012-01-20 17:15:36.510333562 +0400
- +++ drivers_new/Makefile.am 2012-01-20 16:53:01.000000000 +0400
- @@ -28,11 +28,10 @@
- CC="$(LINUX_CC) -I@abs_top_srcdir@ -I@abs_top_srcdir@/drivers/gpib/include -I@abs_top_srcdir@/include" \
- SUBDIRS="$(GPIB_ABS_MODULE_SUBDIR)"
- -install-data-hook: device-file-check /etc/gpib.conf
- +install-data-hook: /etc/gpib.conf
- $(MAKE) -C $(LINUX_SRCDIR) V=1 modules_install\
- CC="$(LINUX_CC) -I@abs_top_srcdir@ -I@abs_top_srcdir@/driver/include -I@abs_top_srcdir@/include" \
- SUBDIRS="$(GPIB_ABS_MODULE_SUBDIR)" INSTALL_MOD_DIR="gpib"
- - $(DEPMOD) -a
- /dev/gpib0:
- groupadd gpib || echo "group gpib exists"
- @@ -60,7 +60,7 @@
- #should move this to util/templates Makefile.am when it exists
- /etc/gpib.conf:
- - $(INSTALL_DATA) -D $(top_srcdir)/util/templates/gpib.conf /etc/gpib.conf
- + $(INSTALL_DATA) -D $(top_srcdir)/util/templates/gpib.conf $(DESTDIR)/etc/gpib.conf
- #make sure compiled files, etc don't make it into distribution tarballs
- dist-hook:
- --- usb/agilent_82357a/Makefile.am 2012-01-20 17:15:27.900333912 +0400
- +++ usb_new/agilent_82357a/Makefile.am 2012-01-20 17:10:56.000000000 +0400
- @@ -13,7 +13,7 @@
- USB_FIRMWARE_DIR=/usr/share/usb/
- install-data-local:
- - test -e $(HOTPLUG_USB_CONF_DIR)/agilent_82357a || $(INSTALL_SCRIPT) -D agilent_82357a $(HOTPLUG_USB_CONF_DIR)/agilent_82357a
- - test -e $(HOTPLUG_USB_CONF_DIR)/agilent_82357a.usermap || $(INSTALL_DATA) -D agilent_82357a.usermap $(HOTPLUG_USB_CONF_DIR)/agilent_82357a.usermap
- - $(INSTALL) -d $(USB_FIRMWARE_DIR)/agilent_82357a
- + test -e $(DESTDIR)/$(HOTPLUG_USB_CONF_DIR)/agilent_82357a || $(INSTALL_SCRIPT) -D agilent_82357a $(DESTDIR)/$(HOTPLUG_USB_CONF_DIR)/agilent_82357a
- + test -e $(DESTDIR)/$(HOTPLUG_USB_CONF_DIR)/agilent_82357a.usermap || $(INSTALL_DATA) -D agilent_82357a.usermap $(DESTDIR)/$(HOTPLUG_USB_CONF_DIR)/agilent_82357a.usermap
- + $(INSTALL) -d $(DESTDIR)/$(USB_FIRMWARE_DIR)/agilent_82357a
- --- usb/ni_usb_gpib/Makefile.am 2012-01-20 17:15:27.897000580 +0400
- +++ usb_new/ni_usb_gpib/Makefile.am 2012-01-20 17:12:39.000000000 +0400
- @@ -13,7 +13,7 @@
- USB_FIRMWARE_DIR=/usr/share/usb/
- install-data-local:
- - test -e $(HOTPLUG_USB_CONF_DIR)/ni_usb_gpib || $(INSTALL_SCRIPT) -D ni_usb_gpib $(HOTPLUG_USB_CONF_DIR)/ni_usb_gpib
- - 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
- - $(INSTALL) -d $(USB_FIRMWARE_DIR)/ni_usb_gpib
- + test -e $(DESTDIR)/$(HOTPLUG_USB_CONF_DIR)/ni_usb_gpib || $(INSTALL_SCRIPT) -D ni_usb_gpib $(DESTDIR)/$(HOTPLUG_USB_CONF_DIR)/ni_usb_gpib
- + 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
- + $(INSTALL) -d $(DESTDIR)/$(USB_FIRMWARE_DIR)/ni_usb_gpib
- \ В конце файла нет новой строки
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement