X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=dc63866d18dbb66bd7094bff104350782751019b;hb=6ce3e60f25c94b31e5d090ea03dee09d70dc1f7b;hp=2a986b05c53f3d5ebc3226b7e4aa7729fb7f6279;hpb=93a31f9b884f8e8f3f7a7d50cf90ffd365a14f7c;p=mmh

diff --git a/Makefile.am b/Makefile.am
index 2a986b0..dc63866 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,9 +33,8 @@ auxexecdir = @libdir@
 ##
 ## nmh _does_ have a test suite!
 ##
-
-TESTS_ENVIRONMENT = MH_OBJ_DIR=@abs_srcdir@ \
-		    MH_TEST_DIR=@abs_srcdir@/test/testdir \
+TESTS_ENVIRONMENT = MH_OBJ_DIR=@abs_builddir@ \
+		    MH_TEST_DIR=@abs_builddir@/test/testdir \
 		    auxexecdir=$(auxexecdir) bindir=$(bindir) \
 		    mandir=$(mandir) sysconfdir=$(sysconfdir)
 ##
@@ -210,6 +209,7 @@ uip_burst_SOURCES = uip/burst.c
 
 uip_comp_SOURCES = uip/comp.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c \
 		   uip/annosbr.c uip/distsbr.c
+uip_comp_LDADD = $(LDADD) $(ICONVLIB)
 
 uip_dist_SOURCES = uip/dist.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c \
 		   uip/annosbr.c uip/distsbr.c