From: Lennart Poettering Date: Tue, 2 Apr 2019 15:05:15 +0000 (+0200) Subject: Revert "build: install /etc/systemd/{system,user}-generators" X-Git-Tag: v242-rc1~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b2b33eb064f82043f790d2af5a17c724140a89a7;p=thirdparty%2Fsystemd.git Revert "build: install /etc/systemd/{system,user}-generators" This reverts commit 509276f2b7d44d472b66e79cbfa531c1de4c3801. --- diff --git a/meson.build b/meson.build index b0306601954..e446fe73702 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 d850e106a39..86ab35d818d 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')))