From 1cfeca882ebbd2de350a62e97e7ace35d3a57644 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Mon, 8 Aug 2016 13:20:56 -0400
Subject: fix

---
 src/grp-udev/Makefile                  | 4 ++--
 src/grp-udev/libudev-core/Makefile     | 6 +++---
 src/grp-udev/libudev-core/net/Makefile | 4 ++--
 src/grp-udev/systemd-hwdb/Makefile     | 2 +-
 src/grp-udev/udevadm/Makefile          | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/grp-udev')

diff --git a/src/grp-udev/Makefile b/src/grp-udev/Makefile
index f6c3b1ceb4..67a17d74a0 100644
--- a/src/grp-udev/Makefile
+++ b/src/grp-udev/Makefile
@@ -69,7 +69,7 @@ SYSINIT_TARGET_WANTS += \
 	systemd-udevd.service \
 	systemd-udev-trigger.service
 
-at.subdirs += systemd-udevd udevadm
-at.subdirs += ata_id cdrom_id collect mtd_probe scsi_id v4l_id
+nested.subdirs += systemd-udevd udevadm
+nested.subdirs += ata_id cdrom_id collect mtd_probe scsi_id v4l_id
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-udev/libudev-core/Makefile b/src/grp-udev/libudev-core/Makefile
index d47fbe3257..f2b8c88eaf 100644
--- a/src/grp-udev/libudev-core/Makefile
+++ b/src/grp-udev/libudev-core/Makefile
@@ -27,7 +27,7 @@ noinst_LTLIBRARIES += \
 	libudev-core.la
 
 $(outdir)/keyboard-keys-list.txt:
-	$(AM_V_GEN)$(CPP) $(ALL_CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9K]/ { if ($$2 != "KEY_MAX") { print $$2 } }' > $@
+	$(AM_V_GEN)$(CPP) $(sd.ALL_CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9K]/ { if ($$2 != "KEY_MAX") { print $$2 } }' > $@
 
 $(outdir)/keyboard-keys-from-name.gperf: $(outdir)/keyboard-keys-list.txt
 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print tolower(substr($$1 ,5)) ", " $$1 }' < $< > $@
@@ -100,8 +100,8 @@ endif # HAVE_ACL
 
 libudev-core.la.SOURCES = $(patsubst src/udev/%,%,$(filter %.c,$(_libudev_core_la_SOURCES) $(_nodist_libudev_core_la_SOURCES)))
 libudev-core.la.DEPENDS = $(addprefix $(outdir)/,$(libudev-core.la.SOURCES:.c=.lo))
-at.subdirs += net
+nested.subdirs += net
 $(outdir)/udev-builtin-keyboard.lo: $(outdir)/keyboard-keys-from-name.h
-systemd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\"
+sd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\"
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-udev/libudev-core/net/Makefile b/src/grp-udev/libudev-core/net/Makefile
index 153afd5089..5ccbd00002 100644
--- a/src/grp-udev/libudev-core/net/Makefile
+++ b/src/grp-udev/libudev-core/net/Makefile
@@ -24,7 +24,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-systemd.CPPFLAGS += $(libshared.CPPFLAGS)
-systemd.CPPFLAGS += $(libsystemd-network.CPPFLAGS)
+sd.CPPFLAGS += $(libshared.CPPFLAGS)
+sd.CPPFLAGS += $(libsystemd-network.CPPFLAGS)
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-udev/systemd-hwdb/Makefile b/src/grp-udev/systemd-hwdb/Makefile
index bf14199ffe..1e5da1d244 100644
--- a/src/grp-udev/systemd-hwdb/Makefile
+++ b/src/grp-udev/systemd-hwdb/Makefile
@@ -73,6 +73,6 @@ EXTRA_DIST += \
 	hwdb/ids-update.pl \
 	hwdb/sdio.ids
 
-systemd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\"
+sd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\"
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-udev/udevadm/Makefile b/src/grp-udev/udevadm/Makefile
index ef173b234b..6fa837f6e3 100644
--- a/src/grp-udev/udevadm/Makefile
+++ b/src/grp-udev/udevadm/Makefile
@@ -42,6 +42,6 @@ udevadm_SOURCES = \
 udevadm_LDADD = \
 	libudev-core.la
 
-systemd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\"
+sd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\"
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
-- 
cgit v1.2.3-54-g00ecf