From e821f6a916c19f148435038be21faeb49beac68c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Thu, 7 Dec 2017 10:44:43 +0100
Subject: [PATCH] meson: place systemd-sulogin-shell in build/

We do that will all executables so that it's easy to call them.
---
 meson.build                   | 10 +++++++++-
 src/sulogin-shell/meson.build | 25 -------------------------
 2 files changed, 9 insertions(+), 26 deletions(-)
 delete mode 100644 src/sulogin-shell/meson.build

diff --git a/meson.build b/meson.build
index 3bdd87fc6b..c0b36a98f2 100644
--- a/meson.build
+++ b/meson.build
@@ -1292,7 +1292,6 @@ subdir('src/resolve')
 subdir('src/timedate')
 subdir('src/timesync')
 subdir('src/vconsole')
-subdir('src/sulogin-shell')
 subdir('src/boot/efi')
 
 subdir('src/test')
@@ -2370,6 +2369,15 @@ if conf.get('ENABLE_NETWORKD') == 1
                    install_dir : rootbindir)
         public_programs += [exe]
 endif
+
+executable('systemd-sulogin-shell',
+           ['src/sulogin-shell/sulogin-shell.c'],
+           include_directories : includes,
+           link_with : [libshared],
+           install_rpath : rootlibexecdir,
+           install : true,
+           install_dir : rootlibexecdir)
+
 ############################################################
 
 foreach tuple : tests
diff --git a/src/sulogin-shell/meson.build b/src/sulogin-shell/meson.build
deleted file mode 100644
index 1617258b79..0000000000
--- a/src/sulogin-shell/meson.build
+++ /dev/null
@@ -1,25 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright 2017 Zbigniew Jędrzejewski-Szmek
-#
-# 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/>.
-
-executable('systemd-sulogin-shell',
-           ['sulogin-shell.c'],
-           include_directories : includes,
-           link_with : [libshared],
-           dependencies : [],
-           install_rpath : rootlibexecdir,
-           install : true,
-           install_dir : rootlibexecdir)