fix guile build

guile/tests/Makefile.am

@@ -19,12 +19,11 @@ include $(top_srcdir)/gtest.mk
 AM_CPPFLAGS=$(XAPIAN_CXXFLAGS)						\
 	 $(GMIME_CFLAGS)						\
 	 $(GLIB_CFLAGS)							\
-	-I ${top_srcdir}						\
-	-I ${top_srcdir}/lib						\
-	-I ${top_srcdir}/lib/tests					\
-	-DMU_TESTMAILDIR=\"${top_srcdir}/lib/tests/testdir\"		\
-	-DMU_TESTMAILDIR2=\"${top_srcdir}/lib/tests/testdir2\"		\
-	-DMU_TESTMAILDIR3=\"${top_srcdir}/lib/tests/testdir3\"		\
+	-I${top_srcdir}							\
+	-I${top_srcdir}/lib						\
+	-DMU_TESTMAILDIR=\"${top_srcdir}/lib/testdir\"			\
+	-DMU_TESTMAILDIR2=\"${top_srcdir}/lib/testdir2\"		\
+	-DMU_TESTMAILDIR3=\"${top_srcdir}/lib/testdir3\"		\
 	-DMU_PROGRAM=\"${abs_top_builddir}/mu/mu\"			\
 	-DMU_GUILE_MODULE_PATH=\"${abs_top_srcdir}/guile/\"		\
 	-DMU_GUILE_LIBRARY_PATH=\"${abs_top_builddir}/guile/.libs\"	\
@@ -42,7 +41,7 @@ noinst_PROGRAMS= $(TEST_PROGS)
 
 TEST_PROGS += test-mu-guile
 test_mu_guile_SOURCES= test-mu-guile.c dummy.cc
-test_mu_guile_LDADD=${top_builddir}/lib/tests/libtestmucommon.la
+test_mu_guile_LDADD=${top_builddir}/lib/libtestmucommon.la
 
 # we need to use dummy.cc to enforce c++ linking...
 BUILT_SOURCES=								\

guile/tests/test-mu-guile.c

@@ -1,6 +1,5 @@
-/* -*- mode: c; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
-**
-** Copyright (C) 2012-2013 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
+/*
+** Copyright (C) 2012-2020 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
 **
 ** This program is free software; you can redistribute it and/or modify it
 ** under the terms of the GNU General Public License as published by the
@@ -25,14 +24,13 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 
-#include "../mu-query.h"
-
+#include <lib/mu-query.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 
 #include "test-mu-common.h"
-#include "mu-store.hh"
+#include <lib/mu-store.hh>
 
 
 /* tests for the command line interface, uses testdir2 */