4 files changed, 9 insertions, 9 deletions
diff --git a/decoder/Makefile.am b/decoder/Makefile.am
index 1130cea7..0b06bff9 100644
--- a/decoder/Makefile.am
+++ b/decoder/Makefile.am
@@ -27,9 +27,9 @@ minimal_decoder_SOURCES = minimal_decoder.cc
 minimal_decoder_LDADD = libcdec.a ../utils/libutils.a
 
 network_decoder_SOURCES = network_decoder.cc nn.hpp
-network_decoder_LDADD = libcdec.a ../klm/search/libksearch.a ../mteval/libmteval.a ../utils/libutils.a ../klm/lm/libklm.a ../klm/util/libklm_util.a ../klm/util/double-conversion/libklm_util_double.a /fast_scratch/simianer/lfpe/nanomsg-0.5-beta/lib/libnanomsg.so
+network_decoder_LDADD = libcdec.a ../klm/search/libksearch.a ../mteval/libmteval.a ../utils/libutils.a ../klm/lm/libklm.a ../klm/util/libklm_util.a ../klm/util/double-conversion/libklm_util_double.a /fast_scratch/simianer/lfpe/lib/nanomsg-0.5-beta/lib/libnanomsg.so
 
-AM_CPPFLAGS = -DTEST_DATA=\"$(top_srcdir)/decoder/test_data\" -DBOOST_TEST_DYN_LINK -W -Wno-sign-compare -I$(top_srcdir) -I$(top_srcdir)/mteval -I$(top_srcdir)/utils -I$(top_srcdir)/klm -I/fast_scratch/simianer/lfpe/nanomsg-0.5-beta/include -I/fast_scratch/simianer/lfpe/cppnanomsg
+AM_CPPFLAGS = -DTEST_DATA=\"$(top_srcdir)/decoder/test_data\" -DBOOST_TEST_DYN_LINK -W -Wno-sign-compare -I$(top_srcdir) -I$(top_srcdir)/mteval -I$(top_srcdir)/utils -I$(top_srcdir)/klm -I/fast_scratch/simianer/lfpe/lib/nanomsg-0.5-beta/include -I/fast_scratch/simianer/lfpe/lib/cppnanomsg
 
 rule_lexer.cc: rule_lexer.ll
 	$(LEX) -s -CF -8 -o$@ $<
diff --git a/training/dtrain/Makefile.am b/training/dtrain/Makefile.am
index a0b5545b..fcc2b218 100644
--- a/training/dtrain/Makefile.am
+++ b/training/dtrain/Makefile.am
@@ -4,10 +4,10 @@ dtrain_SOURCES = dtrain.cc dtrain.h sample.h score.h update.h
 dtrain_LDADD   = ../../decoder/libcdec.a ../../klm/search/libksearch.a ../../mteval/libmteval.a ../../utils/libutils.a ../../klm/lm/libklm.a ../../klm/util/libklm_util.a ../../klm/util/double-conversion/libklm_util_double.a
 
 dtrain_net_SOURCES = dtrain_net.cc dtrain_net.h dtrain.h sample.h score.h update.h
-dtrain_net_LDADD   = ../../decoder/libcdec.a ../../klm/search/libksearch.a ../../mteval/libmteval.a ../../utils/libutils.a ../../klm/lm/libklm.a ../../klm/util/libklm_util.a ../../klm/util/double-conversion/libklm_util_double.a /fast_scratch/simianer/lfpe/nanomsg-0.5-beta/lib/libnanomsg.so
+dtrain_net_LDADD   = ../../decoder/libcdec.a ../../klm/search/libksearch.a ../../mteval/libmteval.a ../../utils/libutils.a ../../klm/lm/libklm.a ../../klm/util/libklm_util.a ../../klm/util/double-conversion/libklm_util_double.a /fast_scratch/simianer/lfpe/lib/nanomsg-0.5-beta/lib/libnanomsg.so
 
 dtrain_net_interface_SOURCES = dtrain_net_interface.cc dtrain_net_interface.h dtrain.h sample_net_interface.h score_net_interface.h update.h
-dtrain_net_interface_LDADD   = ../../decoder/libcdec.a ../../klm/search/libksearch.a ../../mteval/libmteval.a ../../utils/libutils.a ../../klm/lm/libklm.a ../../klm/util/libklm_util.a ../../klm/util/double-conversion/libklm_util_double.a /fast_scratch/simianer/lfpe/nanomsg-0.5-beta/lib/libnanomsg.so
+dtrain_net_interface_LDADD   = ../../decoder/libcdec.a ../../klm/search/libksearch.a ../../mteval/libmteval.a ../../utils/libutils.a ../../klm/lm/libklm.a ../../klm/util/libklm_util.a ../../klm/util/double-conversion/libklm_util_double.a /fast_scratch/simianer/lfpe/lib/nanomsg-0.5-beta/lib/libnanomsg.so
 
-AM_CPPFLAGS = -W -Wall -Wno-sign-compare -I$(top_srcdir)/utils -I$(top_srcdir)/decoder -I$(top_srcdir)/mteval -I/fast_scratch/simianer/lfpe/nanomsg-0.5-beta/include -I/fast_scratch/simianer/lfpe/cppnanomsg
+AM_CPPFLAGS = -W -Wall -Wno-sign-compare -I$(top_srcdir)/utils -I$(top_srcdir)/decoder -I$(top_srcdir)/mteval -I/fast_scratch/simianer/lfpe/lib/nanomsg-0.5-beta/include -I/fast_scratch/simianer/lfpe/lib/cppnanomsg
 
diff --git a/utils/Makefile.am b/utils/Makefile.am
index f057ddbe..f6bf3131 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -100,7 +100,7 @@ atools_LDFLAGS = $(STATIC_FLAGS)
 
 atools_net_SOURCES = atools_net.cc nn.hpp
 atools_net_LDADD = libutils.a
-atools_net_LDFLAGS = $(STATIC_FLAGS) /fast_scratch/simianer/lfpe/nanomsg-0.5-beta/lib/libnanomsg.so
+atools_net_LDFLAGS = $(STATIC_FLAGS) /fast_scratch/simianer/lfpe/lib/nanomsg-0.5-beta/lib/libnanomsg.so
 
 dedup_corpus_SOURCES = dedup_corpus.cc
 dedup_corpus_LDADD = libutils.a
@@ -127,5 +127,5 @@ stringlib_test_LDADD = libutils.a $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_U
 
 ################################################################
 # do NOT NOT NOT add any other -I includes NO NO NO NO NO ######
-AM_CPPFLAGS = -DBOOST_TEST_DYN_LINK -W -Wall -I. -I$(top_srcdir) -DTEST_DATA=\"$(top_srcdir)/utils/test_data\" -I/fast_scratch/simianer/lfpe/nanomsg-0.5-beta/include -I/fast_scratch/simianer/lfpe/cppnanomsg
+AM_CPPFLAGS = -DBOOST_TEST_DYN_LINK -W -Wall -I. -I$(top_srcdir) -DTEST_DATA=\"$(top_srcdir)/utils/test_data\" -I/fast_scratch/simianer/lfpe/lib/nanomsg-0.5-beta/include -I/fast_scratch/simianer/lfpe/lib/cppnanomsg
 ################################################################
diff --git a/word-aligner/Makefile.am b/word-aligner/Makefile.am
index 3985d14b..cd83c10d 100644
--- a/word-aligner/Makefile.am
+++ b/word-aligner/Makefile.am
@@ -9,9 +9,9 @@ binderiv_LDADD = ../utils/libutils.a
 
 net_fa_SOURCES = net_fa.cc ttables.cc da.h ttables.h nn.hpp
 net_fa_LDADD = ../utils/libutils.a
-net_fa_LDFLAGS = $(STATIC_FLAGS) /fast_scratch/simianer/lfpe/nanomsg-0.5-beta/lib/libnanomsg.so
+net_fa_LDFLAGS = $(STATIC_FLAGS) /fast_scratch/simianer/lfpe/lib/nanomsg-0.5-beta/lib/libnanomsg.so
 
 EXTRA_DIST = aligner.pl ortho-norm support makefiles stemmers
 
-AM_CPPFLAGS = -W -Wall -I$(top_srcdir) -I$(top_srcdir)/utils -I$(top_srcdir)/training -I/fast_scratch/simianer/lfpe/nanomsg-0.5-beta/include -I/fast_scratch/simianer/lfpe/cppnanomsg
+AM_CPPFLAGS = -W -Wall -I$(top_srcdir) -I$(top_srcdir)/utils -I$(top_srcdir)/training -I/fast_scratch/simianer/lfpe/lib/nanomsg-0.5-beta/include -I/fast_scratch/simianer/lfpe/lib/cppnanomsg