diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2017-05-12 23:59:19 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2017-05-12 23:59:19 -0400 |
| commit | d64cebd3a4a6f59d72994a985549990c04e02a6f (patch) | |
| tree | fff87a3ac51bf3b2bed0b6616178dfbd009c9921 | |
| parent | e8004017a63aa107497c2825d4082de9f32dd93d (diff) | |
| parent | 0de4eb0223353df44a928e15f778adbe8a490029 (diff) | |
Merge branch 'notsystemd/postmove' into notsystemd/master
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | src/Makefile | 1 | ||||
| l--------- | src/manpages/GNUmakefile | 1 | ||||
| -rw-r--r-- | src/manpages/Makefile | 26 |
4 files changed, 29 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index aeebb59732..2793e32819 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6895,6 +6895,7 @@ sd.CPPFLAGS += $(libsystemd-network.CPPFLAGS) #@src/libsystemd-gcrypt/src/Makefile #@src/libsystemd/src/sd-bus/Makefile #@src/libsystemd/src/sd-hwdb/Makefile +#@src/manpages/Makefile #@all include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/Makefile b/src/Makefile index 7bea64ea42..a390ece982 100644 --- a/src/Makefile +++ b/src/Makefile @@ -45,6 +45,7 @@ nested.subdirs += libsystemd-gcrypt nested.subdirs += libsystemd-network nested.subdirs += libsystemd-shared nested.subdirs += libudev +nested.subdirs += manpages nested.subdirs += nss-myhostname nested.subdirs += nss-systemd nested.subdirs += systemd-ask-password diff --git a/src/manpages/GNUmakefile b/src/manpages/GNUmakefile new file mode 120000 index 0000000000..54fdd42278 --- /dev/null +++ b/src/manpages/GNUmakefile @@ -0,0 +1 @@ +../../GNUmakefile
\ No newline at end of file diff --git a/src/manpages/Makefile b/src/manpages/Makefile new file mode 100644 index 0000000000..908e6e435c --- /dev/null +++ b/src/manpages/Makefile @@ -0,0 +1,26 @@ +# -*- 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 + +include $(topsrcdir)/build-aux/Makefile.tail.mk |