tests: unbreak PACKAGE_BUILD_DIR usage in makefiles

for some reason, a few projects changed this from the expected value of
abs_top_builddir for their test suites, breaking the usage of this define
within those tests

fix T6812

Reviewed-by: Stefan Schmidt <stefan@osg.samsung.com>

diff --git a/src/Makefile_Ector.am b/src/Makefile_Ector.am
index 7baa076..fae3931 100644 (file)
--- a/src/Makefile_Ector.am
+++ b/src/Makefile_Ector.am
@@ -190,8 +190,8 @@ tests_ector_suite_ector_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/tests/ector \
 -DTESTS_WD=\"`pwd`\" \
 -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/ector/suite\" \
--DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/src/tests/ector/suite\" \
--DTESTS_BUILD_DIR=PACKAGE_BUILD_DIR \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/\" \
+-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/ector\" \
 @CHECK_CFLAGS@ \
 @ECTOR_CFLAGS@
 tests_ector_suite_ector_suite_LDADD = @CHECK_LIBS@ @USE_ECTOR_LIBS@

diff --git a/src/Makefile_Eina.am b/src/Makefile_Eina.am
index 408b876..255129b 100644 (file)
--- a/src/Makefile_Eina.am
+++ b/src/Makefile_Eina.am
@@ -365,8 +365,8 @@ tests/eina/eina_test_vpath.c
 tests_eina_eina_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -DTESTS_WD=\"`pwd`\" \
 -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eina\" \
--DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/src/tests/eina\" \
--DTESTS_BUILD_DIR=PACKAGE_BUILD_DIR \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/\" \
+-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eina\" \
 @CHECK_CFLAGS@ \
 @EINA_CFLAGS@
 tests_eina_eina_suite_LDADD = @CHECK_LIBS@ @USE_EINA_LIBS@
@@ -381,7 +381,7 @@ check_LTLIBRARIES = tests/eina/module_dummy.la
 
 tests_eina_module_dummy_la_SOURCES = tests/eina/eina_test_module_dummy.c
 tests_eina_module_dummy_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
--DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/src/tests/eina\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/\" \
 @CHECK_CFLAGS@ \
 @EINA_CFLAGS@
 tests_eina_module_dummy_la_LIBADD = @USE_EINA_LIBS@

diff --git a/src/Makefile_Evil.am b/src/Makefile_Evil.am
index edac73b..7fbe99c 100644 (file)
--- a/src/Makefile_Evil.am
+++ b/src/Makefile_Evil.am
@@ -92,8 +92,8 @@ tests/evil/evil_test_unistd.c
 tests_evil_evil_suite_CPPFLAGS = \
 -I$(top_builddir)/src/lib/efl \
 -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/evil\" \
--DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/src/tests/evil\" \
--DTESTS_BUILD_DIR=PACKAGE_BUILD_DIR \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/\" \
+-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/evil\" \
 @CHECK_CFLAGS@ \
 @EVIL_CFLAGS@
 tests_evil_evil_suite_LDADD = @USE_EVIL_LIBS@ @CHECK_LIBS@