Merge branch 'notsystemd/postmove' into notsystemd/master

3 files changed, 34 insertions, 5 deletions

diff --git a/Makefile.am b/Makefile.am
index 7d808ca07a..7274f44cca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4257,11 +4257,13 @@ systemd_journal_remote_CFLAGS = \
 systemd_journal_remote_LDADD += \
 	$(MICROHTTPD_LIBS)
 
+#@src/grp-journal/grp-remote/Makfile
 if ENABLE_TMPFILES
 dist_tmpfiles_DATA += \
 	tmpfiles.d/systemd-remote.conf
 endif # ENABLE_TMPFILES
 
+#@auto/systemd-journal-remote/Makefile
 if HAVE_GNUTLS
 systemd_journal_remote_LDADD += \
 	$(GNUTLS_LIBS)
diff --git a/src/grp-journal/grp-remote/Makfile b/src/grp-journal/grp-remote/Makfile
new file mode 100644
index 0000000000..aef3511b25
--- /dev/null
+++ b/src/grp-journal/grp-remote/Makfile
@@ -0,0 +1,32 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+ifneq ($(ENABLE_TMPFILES),)
+dist_tmpfiles_DATA += \
+	tmpfiles.d/systemd-remote.conf
+endif # ENABLE_TMPFILES
+
+
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-journal/grp-remote/systemd-journal-remote/Makefile b/src/grp-journal/grp-remote/systemd-journal-remote/Makefile
index 601bad9b5f..82bb33da88 100644
--- a/src/grp-journal/grp-remote/systemd-journal-remote/Makefile
+++ b/src/grp-journal/grp-remote/systemd-journal-remote/Makefile
@@ -39,11 +39,6 @@ systemd_journal_remote_LDADD = \
 	libsystemd-microhttpd.la \
 	libjournal-core.la
 
-ifneq ($(ENABLE_TMPFILES),)
-dist_tmpfiles_DATA += \
-	tmpfiles.d/systemd-remote.conf
-endif # ENABLE_TMPFILES
-
 # systemd-journal-remote make sense mostly with full crypto stack
 dist_systemunit_DATA += \
 	units/systemd-journal-remote.socket