aboutsummaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-03-20 17:20:53 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-03-20 17:21:16 +0900
commitf48741d93dea2890448daaff733441db78417c96 (patch)
tree99553660d89016bfc8d8da7b3ef85f83c9bc2f39 /configure.ac
parentevas: let's be more resistant even with things that should never happen. (diff)
downloadefl-f48741d93dea2890448daaff733441db78417c96.tar.gz
fix dbus service file complaint to work again.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac7
1 files changed, 5 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 3795031183..731b7c9a2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4520,6 +4520,9 @@ if test "x$prefix" != "x/usr"; then
done
resolved_dbusservicedir=$path
+echo "GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG"
+echo "$resolved_dbusservicedir"
+echo "GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG"
old=
path=$USER_SESSION_DIR
while test "x$old" != "x$path"; do
@@ -4542,7 +4545,7 @@ if test "x$prefix" != "x/usr"; then
AC_MSG_NOTICE([installing DBus services in user local "$resolved_dbusservicedir". Only accessible to user $USER])
elif echo "$XDG_DATA_DIRS" | grep -e "$resolved_datadir" >/dev/null 2>/dev/null; then
AC_MSG_NOTICE([installing DBus services in "$resolved_datadir" set in \$XDG_DATA_DIRS. Every user must have \$XDG_DATA_DIRS containing "$resolved_datadir".])
- elif echo "$resolved_dbusservicedir" | grep -e '^/usr' >/dev/null 2>/dev/null; then
+ elif echo "$resolved_dbusservicedir" | grep -e '^/usr/s' >/dev/null 2>/dev/null; then
AC_MSG_NOTICE([installing DBus serivces in $resolved_dbusservicedir])
else
needs_alert_dbus=1
@@ -4556,7 +4559,7 @@ if test "x$prefix" != "x/usr"; then
AC_MSG_NOTICE([installing systemd services in "$base_USER_SESSION_DIR" set in \$XDG_DATA_DIRS. Every user must have \$XDG_DATA_DIRS containing "$base_USER_SESSION_DIR".])
elif echo "$XDG_CONFIG_DIRS" | grep -e "$base_USER_SESSION_DIR" >/dev/null 2>/dev/null; then
AC_MSG_NOTICE([installing systemd services in "$base_USER_SESSION_DIR" set in \$XDG_CONFIG_DIRS. Every user must have \$XDG_CONFIG_DIRS containing "$base_USER_SESSION_DIR".])
- elif echo "$resolved_USER_SESSION_DIR" | grep -e '^/usr' >/dev/null 2>/dev/null; then
+ elif echo "$resolved_USER_SESSION_DIR" | grep -e '^/usr/s' >/dev/null 2>/dev/null; then
AC_MSG_NOTICE([installing systemd serivces in $resolved_USER_SESSION_DIR])
else
needs_alert_systemd=1