--- usbutils-002/Makefile.am	2011-01-13 00:09:34.000000000 +0100
+++ usbutils-002_/Makefile.am	2011-04-26 18:45:03.247443437 +0200
@@ -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 \
 	lsusb.py
@@ -30,7 +21,7 @@

 lsusb_CPPFLAGS = \
 	$(AM_CPPFLAGS) $(LIBUSB_CFLAGS) \
-	-DDATADIR=\"$(datadir)\"
+	-DDATADIR=\"$(datadir)/hwdata\"

 lsusb_LDADD = \
 	$(LIBUSB_LIBS)
@@ -40,21 +31,12 @@
 	usb-devices.1

 EXTRA_DIST = \
-	usb.ids \
-	update-usbids.sh.in \
 	lsusb.8.in \
 	usb-devices.1.in \
 	usb-devices \
 	lsusb.py \
 	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' $< >$@

@@ -68,10 +50,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: