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-journal/Makefile                 | 6 +++---
 src/grp-journal/grp-remote/Makefile      | 6 +++---
 src/grp-journal/journalctl/Makefile      | 2 +-
 src/grp-journal/libjournal-core/Makefile | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/grp-journal')

diff --git a/src/grp-journal/Makefile b/src/grp-journal/Makefile
index 046d93521f..6538713813 100644
--- a/src/grp-journal/Makefile
+++ b/src/grp-journal/Makefile
@@ -167,8 +167,8 @@ tests += \
 	test-compress-benchmark
 endif # HAVE_COMPRESSION
 
-at.subdirs += journalctl systemd-journald libjournal-core
-at.subdirs += systemd-cat
-#at.subdirs += grp-remote
+nested.subdirs += journalctl systemd-journald libjournal-core
+nested.subdirs += systemd-cat
+#nested.subdirs += grp-remote
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-journal/grp-remote/Makefile b/src/grp-journal/grp-remote/Makefile
index 689341d6ae..b1415ad6d3 100644
--- a/src/grp-journal/grp-remote/Makefile
+++ b/src/grp-journal/grp-remote/Makefile
@@ -23,8 +23,8 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-at.subdirs += systemd-journal-gatewayd
-at.subdirs += systemd-journal-remote
-at.subdirs += systemd-journal-upload
+nested.subdirs += systemd-journal-gatewayd
+nested.subdirs += systemd-journal-remote
+nested.subdirs += systemd-journal-upload
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-journal/journalctl/Makefile b/src/grp-journal/journalctl/Makefile
index 7fc5e64143..ce650ae733 100644
--- a/src/grp-journal/journalctl/Makefile
+++ b/src/grp-journal/journalctl/Makefile
@@ -49,6 +49,6 @@ journalctl_LDADD += \
 	$(QRENCODE_LIBS)
 endif # HAVE_QRENCODE
 
-systemd.CPPFLAGS += -DCATALOG_DATABASE=\"$(catalogstatedir)/database\"
+sd.CPPFLAGS += -DCATALOG_DATABASE=\"$(catalogstatedir)/database\"
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-journal/libjournal-core/Makefile b/src/grp-journal/libjournal-core/Makefile
index bcbfd0f8cb..997fcf0468 100644
--- a/src/grp-journal/libjournal-core/Makefile
+++ b/src/grp-journal/libjournal-core/Makefile
@@ -53,6 +53,6 @@ libjournal_core_la_LIBADD = \
 noinst_LTLIBRARIES += \
 	libjournal-core.la
 
-systemd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\"
+sd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\"
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
-- 
cgit v1.2.3-54-g00ecf