X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=Makefile.am;h=7358c78dbc485c7589e06d4a97e4af946364e3c9;hb=265bf7d31f31962e9b72227d253d278c4da6cd58;hp=5b473c38fbf5af4d873000c11f47dffc489492c3;hpb=23af631076209b31fb28feb90a779ff8dcc153a2;p=mmh

diff --git a/Makefile.am b/Makefile.am
index 5b473c3..7358c78 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,11 +33,10 @@ auxexecdir = @libdir@
 ##
 ## nmh _does_ have a test suite!
 ##
-
-TESTS_ENVIRONMENT = MH_TEST_DIR=`pwd`/test/testdir \
-		    MH_TEST_COMMON=`pwd`/test/common.sh \
-		    MH_OBJ_DIR=`pwd` mandir=$(mandir) bindir=$(bindir) \
-		    sysconfdir=$(sysconfdir) auxexecdir=$(auxexecdir)
+TESTS_ENVIRONMENT = MH_OBJ_DIR=@abs_builddir@ \
+		    MH_TEST_DIR=@abs_builddir@/test/testdir \
+		    auxexecdir=$(auxexecdir) bindir=$(bindir) \
+		    mandir=$(mandir) sysconfdir=$(sysconfdir)
 ##
 ## Important note: the "cleanup" test should always be last
 ##
@@ -47,11 +46,13 @@ TESTS = test/bad-input/test-header test/folder/test-create \
 	test/format/test-mymbox \
 	test/inc/test-deb359167 test/inc/test-eom-align \
 	test/manpages/test-manpages test/mhbuild/test-forw \
+	test/mhpath/test-mhpath \
 	test/mhshow/test-cte-binary test/mhshow/test-qp \
 	test/mhshow/test-subpart test/new/test-basic test/pick/test-stderr \
 	test/repl/test-if-str test/scan/test-scan \
 	test/whatnow/test-attach-detach test/whatnow/test-cd \
-	test/whatnow/test-ls test/cleanup
+	test/whatnow/test-ls \
+	test/cleanup ## The "cleanup" test should always be last.
 
 check_SCRIPTS = test/common.sh
 check_PROGRAMS = test/getfullname
@@ -210,6 +211,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