summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2019-04-02 17:05:15 +0200
committerGitHub <noreply@github.com>2019-04-02 17:05:15 +0200
commitbe038dd71f8614689fd6d838598a98c98538dc8b (patch)
treed2c00c712982d496c2ca4ab150800449a80b4595
parent42561fc99c8d7230470fe42cbebe24a5d7cbbb70 (diff)
downloadsystemd-revert-12181-install-etc-systemd-generator-dirs.tar.gz
Revert "build: install /etc/systemd/{system,user}-generators"revert-12181-install-etc-systemd-generator-dirs
This reverts commit 509276f2b7d44d472b66e79cbfa531c1de4c3801.
-rw-r--r--meson.build2
-rw-r--r--src/core/meson.build2
2 files changed, 0 insertions, 4 deletions
diff --git a/meson.build b/meson.build
index b030660195..e446fe7370 100644
--- a/meson.build
+++ b/meson.build
@@ -133,8 +133,6 @@ networkdir = join_paths(rootprefixdir, 'lib/systemd/network')
pkgincludedir = join_paths(includedir, 'systemd')
systemgeneratordir = join_paths(rootlibexecdir, 'system-generators')
usergeneratordir = join_paths(prefixdir, 'lib/systemd/user-generators')
-pkgsysconfsystemgeneratordir = join_paths(pkgsysconfdir, 'system-generators')
-pkgsysconfusergeneratordir = join_paths(pkgsysconfdir, 'user-generators')
systemenvgeneratordir = join_paths(prefixdir, 'lib/systemd/system-environment-generators')
userenvgeneratordir = join_paths(prefixdir, 'lib/systemd/user-environment-generators')
systemshutdowndir = join_paths(rootlibexecdir, 'system-shutdown')
diff --git a/src/core/meson.build b/src/core/meson.build
index d850e106a3..86ab35d818 100644
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -211,8 +211,6 @@ meson.add_install_script('sh', '-c', mkdir_p.format(systemshutdowndir))
meson.add_install_script('sh', '-c', mkdir_p.format(systemsleepdir))
meson.add_install_script('sh', '-c', mkdir_p.format(systemgeneratordir))
meson.add_install_script('sh', '-c', mkdir_p.format(usergeneratordir))
-meson.add_install_script('sh', '-c', mkdir_p.format(pkgsysconfsystemgeneratordir))
-meson.add_install_script('sh', '-c', mkdir_p.format(pkgsysconfusergeneratordir))
meson.add_install_script('sh', '-c',
mkdir_p.format(join_paths(pkgsysconfdir, 'system/multi-user.target.wants')))