* #include "../lib/libcompat.h" in two places

* change .. in LDADD and LIBADD to $(top_builddir)

git-svn-id: svn+ssh://svn.code.sf.net/p/check/code/trunk@467 64e312b2-a51f-0410-8e61-82d0ca0eb02a

diff --git a/src/Makefile.am b/src/Makefile.am
index d60980887403a1016ebbf1eacc06ebb83353bc77..4eaae198c399c49b148411b5429303d35f2f0b82 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@
 lib_LTLIBRARIES                = libcheck.la
 noinst_LTLIBRARIES     = libcheckinternal.la
 
-LIBADD                  = ../lib/libcompat.la
+LIBADD                  = $(top_builddir)/lib/libcompat.la
 
 include_HEADERS                = check.h
 

diff --git a/src/check_run.c b/src/check_run.c
index 09e508b842cdd756b5b882aa3a9b930c47c05892..fdffa8028cb3b1a16f88a13f0d74fd45ca3aa740 100644 (file)
--- a/src/check_run.c
+++ b/src/check_run.c
@@ -19,7 +19,7 @@
  */
 
 #include "config.h"
-#include "lib/libcompat.h"
+#include "../lib/libcompat.h"
 #include <sys/types.h>
 #ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8778c3e6c8a09a193b8a622685711bf8375c72ea..fb23eeffcf86ecd8ca6c8b2812e09f7c756e6dd5 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -15,7 +15,7 @@ noinst_PROGRAMS = \
        ex_xml_output   \
        ex_log_output
 
-LDADD = ../lib/libcompat.la
+LDADD = $(top_builddir)/lib/libcompat.la
 
 EXTRA_DIST = test_output.sh test_log_output.sh test_xml_output.sh
 

diff --git a/tests/check_check_sub.c b/tests/check_check_sub.c
index 303932dd3b18babf966c2d1e0b5c5f985494095e..d49e95a9c07d18dcbe8d22c2cb8e6072245103b5 100644 (file)
--- a/tests/check_check_sub.c
+++ b/tests/check_check_sub.c
@@ -1,4 +1,5 @@
 #include "config.h"
+#include "../lib/libcompat.h"
 #include <sys/types.h>
 #if HAVE_SYS_WAIT_H
 #include <sys/wait.h>
@@ -12,7 +13,6 @@
 
 
 
-
 START_TEST(test_lno)
 {
   fail("Failure expected"); /* line 18*/