From abb935570a86c6c21c5bb3a95e07763247bd4963 Mon Sep 17 00:00:00 2001
From: Chris Dyer <cdyer@Chriss-MacBook-Air.local>
Date: Tue, 8 Jan 2013 22:22:28 -0500
Subject: fixes for dist

---
 mteval/Makefile.am    | 10 ++++++----
 mteval/scorer_test.cc |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'mteval')

diff --git a/mteval/Makefile.am b/mteval/Makefile.am
index b19e4bb1..83adee17 100644
--- a/mteval/Makefile.am
+++ b/mteval/Makefile.am
@@ -8,6 +8,8 @@ TESTS = scorer_test
 
 noinst_LIBRARIES = libmteval.a
 
+EXTRA_DIST = test_data
+
 libmteval_a_SOURCES = \
   aer_scorer.h \
   comb_scorer.h \
@@ -34,12 +36,12 @@ libmteval_a_SOURCES = \
   ter.cc
 
 fast_score_SOURCES = fast_score.cc
-fast_score_LDADD = libmteval.a $(top_srcdir)/utils/libutils.a
+fast_score_LDADD = libmteval.a ../utils/libutils.a
 
 mbr_kbest_SOURCES = mbr_kbest.cc
-mbr_kbest_LDADD = libmteval.a $(top_srcdir)/utils/libutils.a
+mbr_kbest_LDADD = libmteval.a ../utils/libutils.a
 
 scorer_test_SOURCES = scorer_test.cc
-scorer_test_LDADD = libmteval.a $(top_srcdir)/utils/libutils.a $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS)
+scorer_test_LDADD = libmteval.a ../utils/libutils.a $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS)
 
-AM_CPPFLAGS = -DBOOST_TEST_DYN_LINK -W -Wall -Wno-sign-compare $(GTEST_CPPFLAGS) -I$(top_srcdir)/utils
+AM_CPPFLAGS = -DTEST_DATA=\"$(top_srcdir)/mteval/test_data\" -DBOOST_TEST_DYN_LINK -W -Wall -Wno-sign-compare -I$(top_srcdir) -I$(top_srcdir)/utils
diff --git a/mteval/scorer_test.cc b/mteval/scorer_test.cc
index 9b765d0f..da07f154 100644
--- a/mteval/scorer_test.cc
+++ b/mteval/scorer_test.cc
@@ -36,7 +36,7 @@ struct Stuff {
 BOOST_FIXTURE_TEST_SUITE( s, Stuff );
 
 BOOST_AUTO_TEST_CASE(TestCreateFromFiles) {
-  std::string path(boost::unit_test::framework::master_test_suite().argc == 2 ? boost::unit_test::framework::master_test_suite().argv[1] : "test_data");
+  std::string path(boost::unit_test::framework::master_test_suite().argc == 2 ? boost::unit_test::framework::master_test_suite().argv[1] : TEST_DATA);
   vector<string> files;
   files.push_back(path + "/re.txt.0");
   files.push_back(path + "/re.txt.1");
-- 
cgit v1.2.3