[evolution] Move libevolutiontestsettings.so into the --prefix

[Milan Crha <mcrha src gnome org>]

commit 3ece44dd046ce20bf0f2549d966ed730d14f5d29
Author: Milan Crha <mcrha redhat com>
Date:   Fri Aug 12 19:11:53 2016 +0200

    Move libevolutiontestsettings.so into the --prefix
    
    This is not meant to be distributed to end users, unless test-html-editor-units
    is also distributed, but even then it can work without it

 e-util/Makefile.am              |    8 +++++---
 e-util/test-html-editor-units.c |    2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 4ce6a1a..a9785e6 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -73,8 +73,10 @@ noinst_PROGRAMS = \
        test-tree-view-frame \
        $(NULL)
 
-privbuilddir = $(abs_builddir)
-privbuild_LTLIBRARIES = libevolutiontestsettings.la
+# This is not meant to be distributed to end users, unless test-html-editor-units
+# is also distributed, but even then it can work without it
+privsolibtestgiomodulesdir = $(privsolibdir)/test-gio-modules
+privsolibtestgiomodules_LTLIBRARIES = libevolutiontestsettings.la
 
 GITIGNOREFILES = libevolutiontestsettings.so
 
@@ -124,7 +126,7 @@ libevolution_util_la_CPPFLAGS = \
        -DEVOLUTION_UIDIR=\""$(uidir)"\" \
        -DEVOLUTION_RULEDIR=\"$(ruledir)\" \
        -DEVOLUTION_WEB_EXTENSIONS_DIR=\""$(webextensionsdir)"\" \
-       -DABS_BUILDDIR=\"$(abs_builddir)\" \
+       -DEVOLUTION_TESTGIOMODULESDIR=\"$(privsolibtestgiomodulesdir)\" \
        -DG_LOG_DOMAIN=\"evolution-util\" \
        $(EVOLUTION_DATA_SERVER_CFLAGS) \
        $(GNOME_PLATFORM_CFLAGS) \
diff --git a/e-util/test-html-editor-units.c b/e-util/test-html-editor-units.c
index 372e1c6..2d55626 100644
--- a/e-util/test-html-editor-units.c
+++ b/e-util/test-html-editor-units.c
@@ -2698,7 +2698,7 @@ main (gint argc,
 
        /* Force the Evolution's test-keyfile GSettings backend, to not overwrite
           user settings when playing with them. */
-       g_setenv ("GIO_EXTRA_MODULES", ABS_BUILDDIR, TRUE);
+       g_setenv ("GIO_EXTRA_MODULES", EVOLUTION_TESTGIOMODULESDIR, TRUE);
        g_setenv ("GSETTINGS_BACKEND", TEST_KEYFILE_SETTINGS_BACKEND_NAME, TRUE);
        g_setenv (TEST_KEYFILE_SETTINGS_FILENAME_ENVVAR, test_keyfile_filename, TRUE);