diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-11-29 21:30:04 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-11-29 21:30:04 -0500 |
| commit | c0ec90ca15beaedd43c9b6bd894ff6636d67ee51 (patch) | |
| tree | 654757868cd867b12c51159eb78fbe81e90b8b8e /src | |
| parent | 882028f210e5e013e7a03a1ef38a166c0c3acb9c (diff) | |
| parent | 16fd57cc34aefc8472468ec1b51a130aefad5361 (diff) | |
Merge branch 'notsystemd/postmove' into notsystemd/master
Diffstat (limited to 'src')
| -rw-r--r-- | src/grp-udev/hwdb/Makefile | 33 | ||||
| -rw-r--r-- | src/grp-udev/systemd-hwdb/Makefile | 33 |
2 files changed, 34 insertions, 32 deletions
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)\" |