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-system/Makefile           |  4 ++--
 src/grp-system/grp-utils/Makefile | 10 +++++-----
 src/grp-system/libcore/Makefile   | 10 +++++-----
 src/grp-system/systemctl/Makefile |  6 +++---
 src/grp-system/systemd/Makefile   |  8 ++++----
 5 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'src/grp-system')

diff --git a/src/grp-system/Makefile b/src/grp-system/Makefile
index 3ef4fd8c0e..1f794aa7ad 100644
--- a/src/grp-system/Makefile
+++ b/src/grp-system/Makefile
@@ -23,7 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-at.subdirs += systemctl systemd libcore
-at.subdirs += grp-utils
+nested.subdirs += systemctl systemd libcore
+nested.subdirs += grp-utils
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-system/grp-utils/Makefile b/src/grp-system/grp-utils/Makefile
index 9573b5750c..2c8cc75a7c 100644
--- a/src/grp-system/grp-utils/Makefile
+++ b/src/grp-system/grp-utils/Makefile
@@ -23,10 +23,10 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-at.subdirs += systemd-analyze
-at.subdirs += systemd-delta
-at.subdirs += systemd-fstab-generator
-at.subdirs += systemd-run
-at.subdirs += systemd-sysv-generator
+nested.subdirs += systemd-analyze
+nested.subdirs += systemd-delta
+nested.subdirs += systemd-fstab-generator
+nested.subdirs += systemd-run
+nested.subdirs += systemd-sysv-generator
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-system/libcore/Makefile b/src/grp-system/libcore/Makefile
index a93e1e5be0..1f19355412 100644
--- a/src/grp-system/libcore/Makefile
+++ b/src/grp-system/libcore/Makefile
@@ -166,10 +166,10 @@ libcore_la_LIBADD = \
 $(outdir)/load-fragment-gperf-nulstr.c: $(outdir)/load-fragment-gperf.gperf
 	$(AM_V_GEN)$(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@
 
-systemd.CPPFLAGS += -I$(topsrcdir)/src/libudev/src
-systemd.CPPFLAGS += -DMOUNT_PATH=\"$(MOUNT_PATH)\"
-systemd.CPPFLAGS += -DUMOUNT_PATH=\"$(UMOUNT_PATH)\"
-systemd.CPPFLAGS += -DSYSTEMD_CGROUP_AGENT_PATH=\"$(libexecdir)/systemd-cgroups-agent\"
-systemd.CPPFLAGS += -DSYSTEMD_BINARY_PATH=\"$(libexecdir)/systemd\"
+sd.CPPFLAGS += -I$(topsrcdir)/src/libudev/src
+sd.CPPFLAGS += -DMOUNT_PATH=\"$(MOUNT_PATH)\"
+sd.CPPFLAGS += -DUMOUNT_PATH=\"$(UMOUNT_PATH)\"
+sd.CPPFLAGS += -DSYSTEMD_CGROUP_AGENT_PATH=\"$(libexecdir)/systemd-cgroups-agent\"
+sd.CPPFLAGS += -DSYSTEMD_BINARY_PATH=\"$(libexecdir)/systemd\"
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-system/systemctl/Makefile b/src/grp-system/systemctl/Makefile
index 43269c66c7..fcd72b00c5 100644
--- a/src/grp-system/systemctl/Makefile
+++ b/src/grp-system/systemctl/Makefile
@@ -30,8 +30,8 @@ systemctl_SOURCES = \
 systemctl_LDADD = \
 	libshared.la
 
-systemd.CPPFLAGS += -DROOTLIBEXECDIR=\"$(rootlibexecdir)\"
-systemd.CPPFLAGS += -DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\"
-systemd.CPPFLAGS += -DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\"
+sd.CPPFLAGS += -DROOTLIBEXECDIR=\"$(rootlibexecdir)\"
+sd.CPPFLAGS += -DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\"
+sd.CPPFLAGS += -DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\"
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-system/systemd/Makefile b/src/grp-system/systemd/Makefile
index 8184c85da8..91dca30b92 100644
--- a/src/grp-system/systemd/Makefile
+++ b/src/grp-system/systemd/Makefile
@@ -68,10 +68,10 @@ dist_systemunit_DATA_busnames += \
 BUSNAMES_TARGET_WANTS += \
 	org.freedesktop.systemd1.busname
 
-systemd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\"
+sd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\"
 
-systemd.CPPFLAGS += -DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\"
-systemd.CPPFLAGS += -DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\"
-systemd.CPPFLAGS += -DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\"
+sd.CPPFLAGS += -DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\"
+sd.CPPFLAGS += -DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\"
+sd.CPPFLAGS += -DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\"
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
-- 
cgit v1.2.3-54-g00ecf