Updated to reflect that all of the lists are on nongnu.org.

[mmh] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 5b473c3..3b6b84a 100644 (file)
--- 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
@@ -455,8 +457,8 @@ sbr_libmh_a_CPPFLAGS = -I./sbr -DNMHETCDIR='"$(sysconfdir)"' \
                -DMAILSPOOL='"$(mailspool)"' \
                -DSENDMAILPATH='"$(sendmailpath)"' -DNMHBINDIR='"$(bindir)"' \
                -DNMHLIBDIR='"$(libdir)"' \
-               -DDEFAULT_EDITOR='"$(default_editor)"' \
-               -DDEFAULT_PAGER='"$(default_pager)"'
+               -DDEFAULT_EDITOR='"$(editorpath)"' \
+               -DDEFAULT_PAGER='"$(pagerpath)"'
 
 sbr_libdtimep_a_SOURCES = sbr/dtimep.l
 sbr_libdtimep_a_CFLAGS = $(sbr_libmh_a_CPPFLAGS) $(DISABLE_UNUSED_MACROS_WARNING)
@@ -484,8 +486,8 @@ man/man.sed: Makefile
        echo 's,%mandir%,$(mandir),g' >> $@
        echo 's,%mailspool%,$(mailspool),g' >> $@
        echo 's,%sendmailpath%,$(sendmailpath),g' >> $@
-       echo 's,%default_editor%,$(default_editor),g' >> $@
-       echo 's,%default_pager%,$(default_pager),g' >> $@
+       echo 's,%default_editor%,$(editorpath),g' >> $@
+       echo 's,%default_pager%,$(pagerpath),g' >> $@
        echo 's,%manext1%,$(manext1),g' >> $@
        echo 's,%manext5%,$(manext5),g' >> $@
        echo 's,%manext8%,$(manext8),g' >> $@
@@ -532,6 +534,7 @@ rpm: dist
        @cp -p nmh.spec $(rpmdir)/SPECS
        @rpmbuild --define '_topdir $(rpmdir)' \
          --define '_tmppath %{_topdir}/TMP' \
+         --define "_sysconfdir $(DESTDIR)$(sysconfdir)" \
          -ba $(rpmdir)/SPECS/nmh.spec
 .PHONY: rpm