usbutils/usbutils-001-hwdata.patch

63 lines
1.2 KiB
Diff

--- usbutils-001/Makefile.am 2010-11-16 23:12:53.000000000 +0100
+++ usbutils-001_hwdata/Makefile.am 2011-01-06 12:23:30.785190968 +0100
@@ -4,18 +4,9 @@
AM_LDFLAGS = \
-Wl,--as-needed
-data_DATA = \
- usb.ids
-if HAVE_ZLIB
-data_DATA += usb.ids.gz
-endif
-
bin_PROGRAMS = \
lsusb
-sbin_SCRIPTS = \
- update-usbids.sh
-
bin_SCRIPTS = \
usb-devices
@@ -29,7 +20,7 @@
lsusb_CPPFLAGS = \
$(AM_CPPFLAGS) $(LIBUSB_CFLAGS) \
- -DDATADIR=\"$(datadir)\"
+ -DDATADIR=\"$(datadir)/hwdata\"
lsusb_LDADD = \
$(LIBUSB_LIBS)
@@ -39,20 +30,11 @@
usb-devices.1
EXTRA_DIST = \
- usb.ids \
- update-usbids.sh.in \
lsusb.8.in \
usb-devices.1.in \
usb-devices \
usbutils.pc.in
-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' $< >$@
@@ -66,10 +48,8 @@
sed 's|@usbids@|$(datadir)/usb.ids|g;s|@VERSION[@]|$(VERSION)|g' $< >$@
DISTCLEANFILES = \
- usb.ids.gz \
lsusb.8 \
usb-devices.1 \
- update-usbids.sh \
usbutils.pc
distclean-local: