diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-11-29 21:33:33 -0500 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-11-29 21:33:33 -0500 |
commit | a17c888be95c4e12d5c89565e91f63bb0a77d3b3 (patch) | |
tree | d36a15383d285b98f9cf100be2a183fb6f3646d9 | |
parent | c0ec90ca15beaedd43c9b6bd894ff6636d67ee51 (diff) | |
parent | d292f568aa2daf83c3be0174c97bffdd65298bf6 (diff) |
Merge branch 'notsystemd/postmove' into notsystemd/master
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | src/grp-udev/hwdb/Makefile | 2 | ||||
-rw-r--r-- | src/grp-udev/systemd-hwdb/Makefile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 3ffb00eecf..7a763ee1d6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3990,9 +3990,9 @@ INSTALL_DATA_HOOKS += \ hwdb-remove-hook: -test -n "$(DESTDIR)" || rm -f /etc/udev/hwdb.bin +#@auto/systemd-hwdb/Makefile endif # ENABLE_HWDB -#@auto/systemd-hwdb/Makefile EXTRA_DIST += \ units/systemd-hwdb-update.service.in #@auto/hwdb/Makefile diff --git a/src/grp-udev/hwdb/Makefile b/src/grp-udev/hwdb/Makefile index 00f65fb65c..c5d8528013 100644 --- a/src/grp-udev/hwdb/Makefile +++ b/src/grp-udev/hwdb/Makefile @@ -50,8 +50,6 @@ INSTALL_DATA_HOOKS += \ hwdb-remove-hook: -test -n "$(DESTDIR)" || rm -f /etc/udev/hwdb.bin -endif # ENABLE_HWDB - EXTRA_DIST += \ hwdb/ids-update.pl \ hwdb/sdio.ids diff --git a/src/grp-udev/systemd-hwdb/Makefile b/src/grp-udev/systemd-hwdb/Makefile index 3fb4311b79..901753bdf0 100644 --- a/src/grp-udev/systemd-hwdb/Makefile +++ b/src/grp-udev/systemd-hwdb/Makefile @@ -41,6 +41,8 @@ rootbin_PROGRAMS += \ SYSINIT_TARGET_WANTS += \ systemd-hwdb-update.service +endif # ENABLE_HWDB + EXTRA_DIST += \ units/systemd-hwdb-update.service.in |