From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 28 Mar 2018 14:58:37 +0000 (+0200)
Subject: doc: merge docs/ dir → doc/
X-Git-Tag: v239~460
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2d684e65aaacc9f995236843597ddee96ed8aa70;p=thirdparty%2Fsystemd.git

doc: merge docs/ dir → doc/

It's weird having two subdirs for documentation, let's unify this in
one.
---

diff --git a/docs/sysvinit/README.in b/doc/sysvinit/README.in
similarity index 100%
rename from docs/sysvinit/README.in
rename to doc/sysvinit/README.in
diff --git a/docs/sysvinit/meson.build b/doc/sysvinit/meson.build
similarity index 100%
rename from docs/sysvinit/meson.build
rename to doc/sysvinit/meson.build
diff --git a/docs/var-log/README.in b/doc/var-log/README.in
similarity index 100%
rename from docs/var-log/README.in
rename to doc/var-log/README.in
diff --git a/docs/var-log/meson.build b/doc/var-log/meson.build
similarity index 100%
rename from docs/var-log/meson.build
rename to doc/var-log/meson.build
diff --git a/meson.build b/meson.build
index 0d62a115629..b53dfaa94c8 100644
--- a/meson.build
+++ b/meson.build
@@ -2611,8 +2611,8 @@ subdir('network')
 subdir('man')
 subdir('shell-completion/bash')
 subdir('shell-completion/zsh')
-subdir('docs/sysvinit')
-subdir('docs/var-log')
+subdir('doc/sysvinit')
+subdir('doc/var-log')
 
 # FIXME: figure out if the warning is true:
 # https://github.com/mesonbuild/meson/wiki/Reference-manual#install_subdir