Autoconf 2.60 introduced a change that makes it impossible to use
@datadir@ as before. The reason for that is that prefix (and related
variables) is now possible to set at make time (rather than configure
time). So it need to be expanded on the Makefile-level.
With this change shadow resources work again.
Signed-off-by: Paul Fertser <fercer...@gmail.com>
---
fsousaged/configure.ac | 1 -
fsousaged/src/plugins/dbus_service/Makefile.am | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/fsousaged/configure.ac b/fsousaged/configure.ac
index dceda8b..98764d6 100644
--- a/fsousaged/configure.ac
+++ b/fsousaged/configure.ac
@@ -116,7 +116,6 @@ else
DBUS_SYSTEM_SERVICE_DIR="${path_dbusdata}/dbus-1/system-services"
fi
AC_SUBST(DBUS_SYSTEM_SERVICE_DIR)
-AC_DEFINE_UNQUOTED([DBUS_SYSTEM_SERVICE_DIR], ["${DBUS_SYSTEM_SERVICE_DIR}"],
[dbus system service activation dir])
#########################################################################################
# data files
diff --git a/fsousaged/src/plugins/dbus_service/Makefile.am
b/fsousaged/src/plugins/dbus_service/Makefile.am
index fce0c91..70aa1ef 100644
--- a/fsousaged/src/plugins/dbus_service/Makefile.am
+++ b/fsousaged/src/plugins/dbus_service/Makefile.am
@@ -25,6 +25,7 @@ dbus_service_la_VALAFLAGS = \
$(NULL)
dbus_service_la_CFLAGS = \
-I$(top_srcdir)/src/lib \
+ -DDBUS_SYSTEM_SERVICE_DIR="\"$(DBUS_SYSTEM_SERVICE_DIR)\"" \
$(GLIB_CFLAGS) \
$(GEE_CFLAGS) \
$(FSO_CFLAGS) \
--
1.7.10.4
_______________________________________________
Smartphones-userland mailing list
Smartphones-userland@linuxtogo.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/smartphones-userland
