From: Joel Klinghed <the_jk@yahoo.com>
Date: Thu, 6 Mar 2014 10:18:50 +0000 (+0900)
Subject: efl: Use actual destination dirs in warning about using non-standard prefix
X-Git-Tag: v1.9.0+464+gcaabcbe~290
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0f1883df9a978d686971bba9f1450b7eb7a3fd84;p=platform%2Fupstream%2Fefl.git

efl: Use actual destination dirs in warning about using non-standard prefix

Summary:
Instead of relying on ${prefix}/share to be the default for ${datadir} or
${dbusservicedir} use the actual paths where the files will be placed.

Somewhat tricky because of autoconfs desire to keep prefix changeable but
continuously evaluating the variables until they don't change work.

Reviewers: raster, englebass

Reviewed By: raster

CC: cedric, stefan_schmidt

Differential Revision: https://phab.enlightenment.org/D581
---

diff --git a/configure.ac b/configure.ac
index 28c7ef85b0..75d7297508 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4425,6 +4425,20 @@ if test -n "$CFOPT_WARNING"; then
 fi
 
 if test "x$prefix" != "x/usr"; then
+  old=
+  path=$dbusservicedir
+  while test "x$old" != "x$path"; do
+    old=$path
+    eval path="\"$path\""
+  done
+  resolved_dbusservicedir=$path
+  old=
+  path=$datadir
+  while test "x$old" != "x$path"; do
+    old=$path
+    eval path="\"$path\""
+  done
+  resolved_datadir=$path
   echo ""
   echo "#-------------------------------------------------------------------#"
   echo "##==--                          ALERT                          --==##"
@@ -4434,10 +4448,10 @@ if test "x$prefix" != "x/usr"; then
   echo "to ensure some files are visible to dbus otherwise services cannot"
   echo "be started when needed. You will need to do the following:"
   echo ""
-  echo "  ln -s $prefix/share/dbus-1/services/org.enlightenment.Ethumb.service /usr/share/dbus-1/services/org.enlightenment.Ethumb.service"
-  echo "  ln -s $prefix/share/dbus-1/services/org.enlightenment.Efreet.service /usr/share/dbus-1/services/org.enlightenment.Efreet.service"
+  echo "  ln -s ${resolved_dbusservicedir}/org.enlightenment.Ethumb.service /usr/share/dbus-1/services/org.enlightenment.Ethumb.service"
+  echo "  ln -s ${resolved_dbusservicedir}/org.enlightenment.Efreet.service /usr/share/dbus-1/services/org.enlightenment.Efreet.service"
   echo ""
-  echo "or add \"$prefix/share\" to \$XDG_DATA_DIRS"
+  echo "or add \"${resolved_datadir}\" to \$XDG_DATA_DIRS"
   echo ""
   echo "#-------------------------------------------------------------------#"
 fi