Fetch 20-net-ifname.hwdb from upstream repository. Add both 20-net-ifname.hwdb and...

[oweals/hwids.git] / Makefile

diff --git a/Makefile b/Makefile
index fc79e89b0ec1ba023240a7aa3276749b4960882e..dc0c8721f582a055d5ed5b39634319755a3581bf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,12 +24,15 @@ fetch:
        $(Q)curl -z usb.ids -o usb.ids -R http://www.linux-usb.org/usb.ids
        $(Q)curl -z oui.txt -o oui.txt -R http://standards.ieee.org/develop/regauth/oui/oui.txt
        $(Q)curl -z iab.txt -o iab.txt -R http://standards.ieee.org/develop/regauth/iab/iab.txt
+       $(Q)curl -z sdio.ids -o sdio.ids -R http://cgit.freedesktop.org/systemd/systemd/plain/hwdb/sdio.ids
        $(Q)curl -z udev/20-acpi-vendor.hwdb -o udev/20-acpi-vendor.hwdb -R http://cgit.freedesktop.org/systemd/systemd/plain/hwdb/20-acpi-vendor.hwdb
-       $(Q)curl -z udev/20-bluetooth-vendor-product.hwdb -o udev/20-bluetooth-vendor-product.hwdb http://cgit.freedesktop.org/systemd/systemd/plain/hwdb/20-bluetooth-vendor-product.hwdb
+       $(Q)curl -z udev/20-bluetooth-vendor-product.hwdb -o udev/20-bluetooth-vendor-product.hwdb -R http://cgit.freedesktop.org/systemd/systemd/plain/hwdb/20-bluetooth-vendor-product.hwdb
+       $(Q)curl -z udev/20-net-ifname.hwdb -o udev/20-net-ifname.hwdb -R http://cgit.freedesktop.org/systemd/systemd/plain/hwdb/20-net-ifname.hwdb
+       $(Q)curl -z udev/60-keyboard.hwdb -o udev/60-keyboard.hwdb -R http://cgit.freedesktop.org/systemd/systemd/plain/hwdb/60-keyboard.hwdb
        $(Q)curl -z udev-hwdb-update.pl -o udev-hwdb-update.pl -R http://cgit.freedesktop.org/systemd/systemd/plain/hwdb/ids-update.pl
        $(Q)$(STATUS)
 
-PV ?= $(shell ( awk '$$2 == "Date:" { print $$3; nextfile }' pci.ids usb.ids; git log --format=format:%ci -1 -- oui.txt hwdb/20-acpi-vendor.hwdb udev/20-bluetooth-vendor-product.hwdb udev-hwdb-update.pl | cut -d ' ' -f1; ) | sort | tail -n 1 | tr -d -)
+PV ?= $(shell ( awk '$$2 == "Date:" { print $$3; nextfile }' pci.ids usb.ids; git log --format=format:%ci -1 -- oui.txt hwdb/20-acpi-vendor.hwdb udev/20-bluetooth-vendor-product.hwdb 20-net-ifname.hwdb 60-keyboard.hwdb udev-hwdb-update.pl | cut -d ' ' -f1; ) | sort | tail -n 1 | tr -d -)
 P = hwids-$(PV)
 
 tag:
@@ -44,7 +47,7 @@ compress: pci.ids.gz usb.ids.gz
        gzip -c $< > $@
 
 MISCDIR=/usr/share/misc
-HWDBDIR=/usr/lib/udev/hwdb.d
+HWDBDIR=$(shell pkg-config --variable=udevdir udev)/hwdb.d
 DOCDIR=/usr/share/doc/hwids
 
 install-base: compress
@@ -60,3 +63,4 @@ install-hwdb:
        for file in udev/*.hwdb; do \
                install -p -m 644 $$file $(DESTDIR)$(HWDBDIR); \
        done
+       udevadm hwdb --root $(DESTDIR) --update