From d0a7f5cb4288819ca3022f1fd5a648eaf6e3bddf Mon Sep 17 00:00:00 2001
From: Aetf <7437103@gmail.com>
Date: Tue, 24 Jul 2018 16:09:23 -0400
Subject: [PATCH] Only install the wrapper script to PATH

---
 Makefile.am                         |  5 +++--
 configure.ac                        |  2 +-
 docs/kmscon.sh => scripts/kmscon.in | 10 ++++++++--
 3 files changed, 12 insertions(+), 5 deletions(-)
 rename docs/kmscon.sh => scripts/kmscon.in (92%)

diff --git a/Makefile.am b/Makefile.am
index ede1f24..bef9e7a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,6 +31,7 @@ MANPAGES_ALIASES =
 TPHONY =
 
 bin_PROGRAMS =
+libexec_PROGRAMS =
 check_PROGRAMS =
 noinst_PROGRAMS =
 lib_LTLIBRARIES =
@@ -476,8 +477,8 @@ mod_pixman_la_LDFLAGS = \
 # built as part of kmscon.
 #
 
-bin_SCRIPTS += docs/kmscon.sh
-bin_PROGRAMS += kmscon
+bin_SCRIPTS += scripts/kmscon
+libexec_PROGRAMS += kmscon
 check_PROGRAMS += \
 	test_output \
 	test_vt \
diff --git a/configure.ac b/configure.ac
index 63598b4..c31911f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -791,7 +791,7 @@ fi
 # makefiles.
 #
 
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile scripts/kmscon])
 AC_OUTPUT
 
 #
diff --git a/docs/kmscon.sh b/scripts/kmscon.in
similarity index 92%
rename from docs/kmscon.sh
rename to scripts/kmscon.in
index fcd672d..8fdfff5 100755
--- a/docs/kmscon.sh
+++ b/scripts/kmscon.in
@@ -1,6 +1,7 @@
 #!/bin/sh
 #
 # Copyright (c) 2018 Aetf <aetf@unlimitedcodeworks.xyz>
+# Copyright (c) 2018 Fabian Vogt <fvogt@suse.com>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -20,9 +21,14 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+# configuration path
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libexecdir=@libexecdir@
+
 # Get a property from org.freedesktop.locale1
 queryLocale1() {
-    dbus-send --system --print-reply=literal --dest=org.freedesktop.locale1 /org/freedesktop/locale1 org.freedesktop.DBus.Properties.Get "string:org.freedesktop.locale1" "string:$1" | awk '{print $1}'
+    dbus-send --system --print-reply=literal --dest=org.freedesktop.locale1 /org/freedesktop/locale1 org.freedesktop.DBus.Properties.Get "string:org.freedesktop.locale1" "string:$1" | awk '{print $2}'
 }
 
 # Query and setup system locale settings before start kmscon
@@ -49,4 +55,4 @@ setupLocale() {
 }
 
 setupLocale
-exec kmscon "$@"
+exec ${libexecdir}/kmscon "$@"