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

---
 utils/Makefile.am     | 5 ++++-
 utils/weights_test.cc | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'utils')

diff --git a/utils/Makefile.am b/utils/Makefile.am
index 3177325b..c5fedb78 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -13,7 +13,10 @@ TESTS = ts small_vector_test logval_test weights_test dict_test m_test
 
 noinst_LIBRARIES = libutils.a
 
+# EXTRA_DIST = test_data
+
 libutils_a_SOURCES = \
+  test_data \
   alias_sampler.h \
   alignment_io.h \
   array2d.h \
@@ -101,6 +104,6 @@ small_vector_test_LDADD = libutils.a $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOS
 
 ################################################################
 # do NOT NOT NOT add any other -I includes NO NO NO NO NO ######
-AM_CPPFLAGS = -DBOOST_TEST_DYN_LINK -W -Wall -I.
+AM_CPPFLAGS = -DBOOST_TEST_DYN_LINK -W -Wall -I. -I$(top_srcdir) -DTEST_DATA=\"$(top_srcdir)/utils/test_data\"
 ################################################################
 
diff --git a/utils/weights_test.cc b/utils/weights_test.cc
index 4be4c40f..0d5d8512 100644
--- a/utils/weights_test.cc
+++ b/utils/weights_test.cc
@@ -7,6 +7,6 @@ using namespace std;
 
 BOOST_AUTO_TEST_CASE(Load) {
   vector<weight_t> v;
-  Weights::InitFromFile("test_data/weights", &v);
+  Weights::InitFromFile(TEST_DATA "/weights", &v);
   Weights::WriteToFile("-", v);
 }
-- 
cgit v1.2.3