Here's the proper fix instead of the hack of d28ce569fe233141f86fe516878361da01c9f9cb...
[mmh] / Makefile.am
index 84bf58f..dc63866 100644 (file)
@@ -33,16 +33,18 @@ 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
 ##
 TESTS = test/bad-input/test-header test/folder/test-create \
-       test/folder/test-total test/inc/test-deb359167 test/inc/test-eom-align \
+       test/folder/test-total test/format/test-localmbox \
+       test/format/test-myname test/format/test-myhost \
+       test/format/test-mymbox \
+       test/inc/test-deb359167 test/inc/test-eom-align \
        test/manpages/test-manpages test/mhbuild/test-forw \
        test/mhshow/test-cte-binary test/mhshow/test-qp \
        test/mhshow/test-subpart test/new/test-basic test/pick/test-stderr \
@@ -51,6 +53,7 @@ TESTS = test/bad-input/test-header test/folder/test-create \
        test/whatnow/test-ls test/cleanup
 
 check_SCRIPTS = test/common.sh
+check_PROGRAMS = test/getfullname
 
 ##
 ## Stuff that should be cleaned via "make clean"
@@ -206,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
@@ -341,6 +345,9 @@ uip_spost_SOURCES = uip/spost.c uip/aliasbr.c
 uip_viamail_SOURCES = uip/viamail.c uip/mhmisc.c uip/mhoutsbr.c uip/sendsbr.c \
                      uip/annosbr.c uip/distsbr.c
 
+test_getfullname_SOURCES = test/getfullname.c
+test_getfullname_LDADD =
+
 ##
 ## Our rebuild rules for files that aren't built via the normal mechanisms
 ##