diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-10-27 00:07:35 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-10-27 00:07:35 -0400 |
| commit | 93fd8d3a035f6acb134adff0d6b34e7fba5e72af (patch) | |
| tree | c90c8871f6fcf184651c266eff8075085987977e /src/grp-journal | |
| parent | 7b997776df38e196b4a779ee4e6be3acd0a363e2 (diff) | |
| parent | f0f1df7d0a18ba2db795a610f27c1922cdbf6ed6 (diff) | |
Merge branch 'notsystemd/postmove' into notsystemd/master
Diffstat (limited to 'src/grp-journal')
| -rw-r--r-- | src/grp-journal/Makefile | 1 | ||||
| -rw-r--r-- | src/grp-journal/grp-remote/libsystemd-microhttpd/Makefile | 2 | ||||
| -rw-r--r-- | src/grp-journal/grp-remote/libsystemd-microhttpd/src/Makefile | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/src/grp-journal/Makefile b/src/grp-journal/Makefile index acd4b7a0a1..59ae3ee8b3 100644 --- a/src/grp-journal/Makefile +++ b/src/grp-journal/Makefile @@ -192,7 +192,6 @@ dist_systempreset_DATA = \ nested.subdirs += grp-remote nested.subdirs += journalctl -nested.subdirs += libjournal-core nested.subdirs += systemd-cat nested.subdirs += systemd-journald diff --git a/src/grp-journal/grp-remote/libsystemd-microhttpd/Makefile b/src/grp-journal/grp-remote/libsystemd-microhttpd/Makefile index 4a9896ee1c..ef8de68e3a 100644 --- a/src/grp-journal/grp-remote/libsystemd-microhttpd/Makefile +++ b/src/grp-journal/grp-remote/libsystemd-microhttpd/Makefile @@ -8,7 +8,7 @@ # Copyright 2013 David Strauss # Copyright 2016 Luke Shumaker # -# systemd is free software; you can redistribute it anor modify it +# 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. diff --git a/src/grp-journal/grp-remote/libsystemd-microhttpd/src/Makefile b/src/grp-journal/grp-remote/libsystemd-microhttpd/src/Makefile index 7df638b778..b0eae79db5 100644 --- a/src/grp-journal/grp-remote/libsystemd-microhttpd/src/Makefile +++ b/src/grp-journal/grp-remote/libsystemd-microhttpd/src/Makefile @@ -8,7 +8,7 @@ # Copyright 2013 David Strauss # Copyright 2016 Luke Shumaker # -# systemd is free software; you can redistribute it anor modify it +# 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. |