diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2012-11-16 23:10:13 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2012-11-16 23:29:56 +0100 |
| commit | ee623f0d0c04a9c8da4953ddc29862c8c4945458 (patch) | |
| tree | 87e686c8fd1ad0b94d8cb804c2f43edf569c9987 /Makefile.am | |
| parent | 4ec24515daa780118709e04cd78dae93f25a8428 (diff) | |
hwdb: use $(localstatedir)/lib/udev/hwdb.bin for the binary database
It's not configuration, so it doesn't belong in udev.
Also, remove the catalog when uninstalling udev.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index f3bda0176b..1f30ba8cb8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -65,6 +65,8 @@ sysvinitdir=$(SYSTEM_SYSVINIT_PATH) varlogdir=$(localstatedir)/log systemdstatedir=$(localstatedir)/lib/systemd catalogstatedir=$(systemdstatedir)/catalog +udevstatedir=$(localstatedir)/lib/udev +hwdb_bin=$(udevstatedir)/hwdb.bin # Our own, non-special dirs pkgsysconfdir=$(sysconfdir)/systemd @@ -130,6 +132,7 @@ AM_CPPFLAGS = \ -DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \ -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \ -DCATALOG_PATH=\"$(catalogstatedir)\" \ + -DHWDB_BIN=\"$(hwdb_bin)\" \ -DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \ -DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\" \ -DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \ @@ -1962,11 +1965,14 @@ udevadm_LDADD = \ # Update hwdb on installation. Do not bother if installing # in DESTDIR, since this is likely for packaging purposes. hwdb-update-hook: - -test -n "$(DESTDIR)" || udevadm hwdb --update + -test -n "$(DESTDIR)" || $(bindir)/udevadm hwdb --update INSTALL_DATA_HOOKS += \ hwdb-update-hook +hwdb-remove-hook: + -test -n "$(DESTDIR)" || rm -f $(HWDB_BIN) + # ------------------------------------------------------------------------------ TESTS += \ test/udev-test.pl \ |