diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2017-05-10 17:37:15 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2017-05-10 17:37:15 -0400 |
| commit | 7beff93aec2f58dbe4ba7d122f7234d4a9f41a87 (patch) | |
| tree | 3d69e411b1c46b6d9c3360a0d5ad99844acf136e /src | |
| parent | 13520ea57ca3672cc1fb991383d3375ef124344e (diff) | |
| parent | cc82d70c3f0fac38923adc5ed23f6a76b9ee9bfe (diff) | |
Merge branch 'notsystemd/postmove' into notsystemd/master
Diffstat (limited to 'src')
| -rw-r--r-- | src/grp-journal/grp-remote/Makfile | 32 | ||||
| -rw-r--r-- | src/grp-journal/grp-remote/systemd-journal-remote/Makefile | 5 |
2 files changed, 32 insertions, 5 deletions
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 |