From 653177522d4e3dcd9d911610aee4307d8cd6b7a5 Mon Sep 17 00:00:00 2001
From: mjwybrow <mjwybrow@users.sourceforge.net>
Date: Fri, 14 Jul 2006 06:42:37 +0000
Subject: [PATCH]     * src/Makefile_insert, src/Makefile.am,
 src/svg/Makefile_insert,       src/xml/Makefile_insert,
 src/libnr/Makefile_insert:       Add "$(srcdir)/" to some things so that
 "make check" works in       the case that the build directory is somewhere
 other than the       source directory.

---
 ChangeLog                 |  6 ++++++
 src/Makefile.am           |  2 +-
 src/Makefile_insert       | 28 ++++++++++++++--------------
 src/libnr/Makefile_insert |  2 +-
 src/svg/Makefile_insert   |  2 +-
 5 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 615203404..dcc9e1e82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2006-07-13  Michael Wybrow  <mjwybrow@users.sourceforge.net>
 
+	* src/Makefile_insert, src/Makefile.am, src/svg/Makefile_insert,
+	  src/xml/Makefile_insert, src/libnr/Makefile_insert:
+	  Add "$(srcdir)/" to some things so that "make check" works in 
+	  the case that the build directory is somewhere other than the
+	  source directory.
+
 	* src/sp-conn-end-pair.cpp, src/connector-context.cpp,
 	  src/document.cpp, src/libavoid/*:
 	  Update libavoid with upstream fixes, optimisations and new features.
diff --git a/src/Makefile.am b/src/Makefile.am
index f69bb9bf1..2a0e10c8f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -226,7 +226,7 @@ test-all.cpp: \
 		$(svg_test_svg_includes)	\
 		$(xml_test_xml_includes)	\
 		$(test_all_includes)
-	$(top_srcdir)/cxxtest/cxxtestgen.pl --template=selfname.tpl -root -o test-all.cpp	\
+	$(top_srcdir)/cxxtest/cxxtestgen.pl --template=$(srcdir)/selfname.tpl -root -o test-all.cpp	\
 		$(libnr_test_nr_includes)	\
 		$(svg_test_svg_includes)	\
 		$(xml_test_xml_includes)	\
diff --git a/src/Makefile_insert b/src/Makefile_insert
index b136a55e6..e096ef5e4 100644
--- a/src/Makefile_insert
+++ b/src/Makefile_insert
@@ -342,17 +342,17 @@ inkscape_version.h: ../configure.ac
 	echo '#define INKSCAPE_VERSION "$(VERSION)"' > inkscape_version.h
 
 test_all_includes = \
-		attributes-test.h	\
-		color-profile-test.h	\
-                MultiPrinter.h  \
-                TRPIFormatter.h \
-                PylogFormatter.h \
-		dir-util-test.h	\
-		extract-uri-test.h	\
-		mod360-test.h	\
-		round-test.h	\
-		sp-gradient-test.h	\
-		sp-style-elem-test.h	\
-		style-test.h	\
-                test-helpers.h  \
-		verbs-test.h
+		$(srcdir)/attributes-test.h	\
+		$(srcdir)/color-profile-test.h	\
+		$(srcdir)/MultiPrinter.h  \
+		$(srcdir)/TRPIFormatter.h \
+		$(srcdir)/PylogFormatter.h \
+		$(srcdir)/dir-util-test.h	\
+		$(srcdir)/extract-uri-test.h	\
+		$(srcdir)/mod360-test.h	\
+		$(srcdir)/round-test.h	\
+		$(srcdir)/sp-gradient-test.h	\
+		$(srcdir)/sp-style-elem-test.h	\
+		$(srcdir)/style-test.h	\
+		$(srcdir)/test-helpers.h  \
+		$(srcdir)/verbs-test.h
diff --git a/src/libnr/Makefile_insert b/src/libnr/Makefile_insert
index 004a221be..72e5b56e7 100644
--- a/src/libnr/Makefile_insert
+++ b/src/libnr/Makefile_insert
@@ -111,7 +111,7 @@ libnr_testnr_LDADD =	\
 
 
 libnr/test-nr-main.cpp: libnr/test-nr.cpp
-	$(top_srcdir)/cxxtest/cxxtestgen.pl --template=selfname.tpl -root -o libnr/test-nr-main.cpp $(libnr_test_nr_includes)
+	$(top_srcdir)/cxxtest/cxxtestgen.pl --template=$(srcdir)/selfname.tpl -root -o libnr/test-nr-main.cpp $(libnr_test_nr_includes)
 
 libnr/test-nr.cpp: $(libnr_test_nr_includes)
 	$(top_srcdir)/cxxtest/cxxtestgen.pl -part -o libnr/test-nr.cpp $(libnr_test_nr_includes)
diff --git a/src/svg/Makefile_insert b/src/svg/Makefile_insert
index 089bc875f..40af90e65 100644
--- a/src/svg/Makefile_insert
+++ b/src/svg/Makefile_insert
@@ -37,7 +37,7 @@ svg_libspsvg_a_SOURCES =	\
 # This CxxTest stuff is adapted blindly from libnr/Makefile_insert.
 # It would be nice to reduce the amount of boilerplate / copy&paste here.
 svg/test-svg-main.cpp: svg/test-svg.cpp
-	$(top_srcdir)/cxxtest/cxxtestgen.pl --template=selfname.tpl -root -o svg/test-svg-main.cpp $(svg_test_svg_includes)
+	$(top_srcdir)/cxxtest/cxxtestgen.pl --template=$(srcdir)/selfname.tpl -root -o svg/test-svg-main.cpp $(svg_test_svg_includes)
 
 svg/test-svg.cpp: $(svg_test_svg_includes) svg/Makefile_insert
 	$(top_srcdir)/cxxtest/cxxtestgen.pl -part -o svg/test-svg.cpp $(svg_test_svg_includes)
-- 
2.30.2