diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2017-05-10 17:39:18 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2017-05-10 17:39:18 -0400 |
| commit | 9ac1eb2698bccba79999acb9510a0f39fb50a2dc (patch) | |
| tree | 480fc0a3cea52600b079159b5dc4ed1157706b51 | |
| parent | 7beff93aec2f58dbe4ba7d122f7234d4a9f41a87 (diff) | |
| parent | caca5cbb541dfa581241f8bd97b4d27d9b3d7e3e (diff) | |
Merge branch 'notsystemd/postmove' into notsystemd/master
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | src/grp-journal/grp-remote/Makefile | 5 | ||||
| -rw-r--r-- | src/grp-journal/grp-remote/Makfile | 32 |
3 files changed, 6 insertions, 33 deletions
diff --git a/Makefile.am b/Makefile.am index 7274f44cca..f032bfa65f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4257,7 +4257,7 @@ systemd_journal_remote_CFLAGS = \ systemd_journal_remote_LDADD += \ $(MICROHTTPD_LIBS) -#@src/grp-journal/grp-remote/Makfile +#@src/grp-journal/grp-remote/Makefile if ENABLE_TMPFILES dist_tmpfiles_DATA += \ tmpfiles.d/systemd-remote.conf diff --git a/src/grp-journal/grp-remote/Makefile b/src/grp-journal/grp-remote/Makefile index d1ef4329db..8b9dcaf7ca 100644 --- a/src/grp-journal/grp-remote/Makefile +++ b/src/grp-journal/grp-remote/Makefile @@ -23,6 +23,11 @@ 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 + nested.subdirs += libsystemd-microhttpd nested.subdirs += systemd-journal-gatewayd nested.subdirs += systemd-journal-remote diff --git a/src/grp-journal/grp-remote/Makfile b/src/grp-journal/grp-remote/Makfile deleted file mode 100644 index aef3511b25..0000000000 --- a/src/grp-journal/grp-remote/Makfile +++ /dev/null @@ -1,32 +0,0 @@ -# -*- 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 |