usbutils/usbutils-0.86-hwdata.patch

71 lines
1.5 KiB
Diff
Raw Normal View History

diff -Nru usbutils-0.86.orig/Makefile.am usbutils-0.86/Makefile.am
--- usbutils-0.86.orig/Makefile.am 2009-08-18 00:23:35.000000000 +0200
+++ usbutils-0.86/Makefile.am 2011-10-31 18:26:36.444897471 +0100
@@ -1,18 +1,9 @@
AM_LDFLAGS = \
-Wl,--as-needed
-data_DATA = \
- usb.ids
-if HAVE_ZLIB
-data_DATA += usb.ids.gz
-endif
-
sbin_PROGRAMS = \
lsusb
-sbin_SCRIPTS = \
- update-usbids.sh
-
bin_SCRIPTS = \
usb-devices
@@ -26,7 +17,7 @@
lsusb_CPPFLAGS = \
$(AM_CPPFLAGS) \
- -DDATADIR=\"$(datadir)\"
+ -DDATADIR=\"$(datadir)/hwdata\"
lsusb_LDADD = \
$(LIBUSB_LIBS)
@@ -36,22 +27,13 @@
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' $< >$@
+ sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/hwdata/usb.ids|g' $< >$@
usb-devices.1: $(srcdir)/usb-devices.1.in
sed 's|VERSION|$(VERSION)|g' $< >$@
@@ -60,13 +42,11 @@
pkgconfig_DATA = usbutils.pc
usbutils.pc: $(srcdir)/usbutils.pc.in
- sed 's|@usbids@|$(datadir)/usb.ids|g;s|@VERSION[@]|$(VERSION)|g' $< >$@
+ sed 's|@usbids@|$(datadir)/hwdata/usb.ids|g;s|@VERSION[@]|$(VERSION)|g' $< >$@
DISTCLEANFILES = \
- usb.ids.gz \
lsusb.8 \
usb-devices.1 \
- update-usbids.sh \
usbutils.pc
distclean-local: