diff options
| -rw-r--r-- | Makefile.am | 10 | ||||
| -rw-r--r-- | src/grp-udev/hwdb/Makefile | 33 | ||||
| -rw-r--r-- | src/grp-udev/systemd-hwdb/Makefile | 33 |
3 files changed, 42 insertions, 34 deletions
diff --git a/Makefile.am b/Makefile.am index bb5c03721d..3ffb00eecf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3957,6 +3957,7 @@ systemd_hwdb_LDADD = \ rootbin_PROGRAMS += \ systemd-hwdb +#@auto/hwdb/Makefile dist_udevhwdb_DATA = \ hwdb/20-pci-vendor-model.hwdb \ hwdb/20-pci-classes.hwdb \ @@ -3974,12 +3975,14 @@ dist_udevhwdb_DATA = \ hwdb/70-pointingstick.hwdb \ hwdb/70-touchpad.hwdb +#@auto/systemd-hwdb/Makefile SYSINIT_TARGET_WANTS += \ systemd-hwdb-update.service +#@auto/hwdb/Makefile # Update hwdb on installation. Do not bother if installing # in DESTDIR, since this is likely for packaging purposes. -hwdb-update-hook: +hwdb-update-hook: $(DESTDIR)$(rootbindir)/systemd-hwdb -test -n "$(DESTDIR)" || $(rootbindir)/systemd-hwdb update INSTALL_DATA_HOOKS += \ @@ -3989,8 +3992,11 @@ hwdb-remove-hook: -test -n "$(DESTDIR)" || rm -f /etc/udev/hwdb.bin endif # ENABLE_HWDB +#@auto/systemd-hwdb/Makefile +EXTRA_DIST += \ + units/systemd-hwdb-update.service.in +#@auto/hwdb/Makefile EXTRA_DIST += \ - units/systemd-hwdb-update.service.in \ hwdb/ids-update.pl \ hwdb/sdio.ids diff --git a/src/grp-udev/hwdb/Makefile b/src/grp-udev/hwdb/Makefile index 42f6f501f3..00f65fb65c 100644 --- a/src/grp-udev/hwdb/Makefile +++ b/src/grp-udev/hwdb/Makefile @@ -23,6 +23,39 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk +dist_udevhwdb_DATA = \ + hwdb/20-pci-vendor-model.hwdb \ + hwdb/20-pci-classes.hwdb \ + hwdb/20-usb-vendor-model.hwdb \ + hwdb/20-usb-classes.hwdb \ + hwdb/20-sdio-vendor-model.hwdb \ + hwdb/20-sdio-classes.hwdb \ + hwdb/20-bluetooth-vendor-product.hwdb \ + hwdb/20-acpi-vendor.hwdb \ + hwdb/20-OUI.hwdb \ + hwdb/20-net-ifname.hwdb \ + hwdb/60-evdev.hwdb \ + hwdb/60-keyboard.hwdb \ + hwdb/70-mouse.hwdb \ + hwdb/70-pointingstick.hwdb \ + hwdb/70-touchpad.hwdb + +# Update hwdb on installation. Do not bother if installing +# in DESTDIR, since this is likely for packaging purposes. +hwdb-update-hook: $(DESTDIR)$(rootbindir)/systemd-hwdb + -test -n "$(DESTDIR)" || $(rootbindir)/systemd-hwdb update + +INSTALL_DATA_HOOKS += \ + hwdb-update-hook + +hwdb-remove-hook: + -test -n "$(DESTDIR)" || rm -f /etc/udev/hwdb.bin +endif # ENABLE_HWDB + +EXTRA_DIST += \ + hwdb/ids-update.pl \ + hwdb/sdio.ids + .PHONY: hwdb-update hwdb-update: ( cd $(top_srcdir)/hwdb && \ diff --git a/src/grp-udev/systemd-hwdb/Makefile b/src/grp-udev/systemd-hwdb/Makefile index 1bb6efb352..3fb4311b79 100644 --- a/src/grp-udev/systemd-hwdb/Makefile +++ b/src/grp-udev/systemd-hwdb/Makefile @@ -38,42 +38,11 @@ systemd_hwdb_LDADD = \ rootbin_PROGRAMS += \ systemd-hwdb -dist_udevhwdb_DATA = \ - hwdb/20-pci-vendor-model.hwdb \ - hwdb/20-pci-classes.hwdb \ - hwdb/20-usb-vendor-model.hwdb \ - hwdb/20-usb-classes.hwdb \ - hwdb/20-sdio-vendor-model.hwdb \ - hwdb/20-sdio-classes.hwdb \ - hwdb/20-bluetooth-vendor-product.hwdb \ - hwdb/20-acpi-vendor.hwdb \ - hwdb/20-OUI.hwdb \ - hwdb/20-net-ifname.hwdb \ - hwdb/60-evdev.hwdb \ - hwdb/60-keyboard.hwdb \ - hwdb/70-mouse.hwdb \ - hwdb/70-pointingstick.hwdb \ - hwdb/70-touchpad.hwdb - SYSINIT_TARGET_WANTS += \ systemd-hwdb-update.service -# Update hwdb on installation. Do not bother if installing -# in DESTDIR, since this is likely for packaging purposes. -hwdb-update-hook: - -test -n "$(DESTDIR)" || $(rootbindir)/systemd-hwdb update - -INSTALL_DATA_HOOKS += \ - hwdb-update-hook - -hwdb-remove-hook: - -test -n "$(DESTDIR)" || rm -f /etc/udev/hwdb.bin -endif # ENABLE_HWDB - EXTRA_DIST += \ - units/systemd-hwdb-update.service.in \ - hwdb/ids-update.pl \ - hwdb/sdio.ids + units/systemd-hwdb-update.service.in sd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" |