usbutils/usbutils-003-hwdata.patch

80 lines
1.5 KiB
Diff
Raw Normal View History

2011-06-16 13:44:45 +00:00
--- usbutils-003/Makefile.am 2011-03-22 00:23:33.000000000 +0100
+++ usbutils-003_/Makefile.am 2011-06-16 15:41:20.927882420 +0200
@@ -4,15 +4,9 @@
2009-09-16 11:44:30 +00:00
AM_LDFLAGS = \
-Wl,--as-needed
2011-06-16 13:44:45 +00:00
2009-09-16 11:44:30 +00:00
-data_DATA = \
- usb.ids
-
bin_PROGRAMS = \
2009-09-16 11:44:30 +00:00
lsusb
2011-06-16 13:44:45 +00:00
2009-09-16 11:44:30 +00:00
-sbin_SCRIPTS = \
- update-usbids.sh
-
bin_SCRIPTS = \
2011-04-26 16:53:37 +00:00
usb-devices \
lsusb.py
2011-06-16 13:44:45 +00:00
@@ -27,37 +21,22 @@
2009-09-16 11:44:30 +00:00
lsusb_CPPFLAGS = \
2010-08-30 11:50:38 +00:00
$(AM_CPPFLAGS) $(LIBUSB_CFLAGS) \
2009-09-16 11:44:30 +00:00
- -DDATADIR=\"$(datadir)\"
+ -DDATADIR=\"$(datadir)/hwdata\"
2011-06-16 13:44:45 +00:00
2009-09-16 11:44:30 +00:00
lsusb_LDADD = \
$(LIBUSB_LIBS)
2011-06-16 13:44:45 +00:00
-if HAVE_ZLIB
-data_DATA += usb.ids.gz
-lsusb_CPPFLAGS += -DHAVE_LIBZ
-lsusb_LDADD += -lz
-endif
-
man_MANS = \
lsusb.8 \
2009-09-16 11:44:30 +00:00
usb-devices.1
2011-06-16 13:44:45 +00:00
2009-09-16 11:44:30 +00:00
EXTRA_DIST = \
- usb.ids \
- update-usbids.sh.in \
lsusb.8.in \
usb-devices.1.in \
usb-devices \
2011-04-26 16:53:37 +00:00
lsusb.py \
2009-09-16 11:44:30 +00:00
usbutils.pc.in
2011-06-16 13:44:45 +00:00
2009-09-16 11:44:30 +00:00
-usb.ids.gz: $(srcdir)/usb.ids
- gzip -c -9 $< > $@
-
-update-usbids.sh: $(srcdir)/update-usbids.sh.in
- sed 's|@usbids@|$(datadir)/usb.ids|g' $< >$@
- chmod 755 $@
-
lsusb.8: $(srcdir)/lsusb.8.in
sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@
2011-06-16 13:44:45 +00:00
@@ -71,10 +50,8 @@
2009-09-16 11:44:30 +00:00
sed 's|@usbids@|$(datadir)/usb.ids|g;s|@VERSION[@]|$(VERSION)|g' $< >$@
2011-06-16 13:44:45 +00:00
2009-09-16 11:44:30 +00:00
DISTCLEANFILES = \
- usb.ids.gz \
lsusb.8 \
usb-devices.1 \
- update-usbids.sh \
usbutils.pc
2011-06-16 13:44:45 +00:00
2009-09-16 11:44:30 +00:00
distclean-local:
2011-08-13 16:51:23 +00:00
--- usbutils-003/lsusb.py 2010-12-16 01:07:09.000000000 +0100
+++ usbutils-003_/lsusb.py 2011-08-11 09:57:57.079327430 +0200
@@ -16,7 +16,7 @@
warnsort = False
prefix = "/sys/bus/usb/devices/"
-usbids = "/usr/share/usb.ids"
+usbids = "/usr/share/hwdata/usb.ids"
esc = chr(27)
norm = esc + "[0;0m"