X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=a219981d62d458e198f433b5c002d2a69916a1da;hb=2d1f77125ffb16daf661a40710bb0fb48343d1f9;hp=7358c78dbc485c7589e06d4a97e4af946364e3c9;hpb=67473e912ec0a0849a70cb61d9368c75dae614ee;p=mmh

diff --git a/Makefile.am b/Makefile.am
index 7358c78..a219981 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,7 +40,8 @@ TESTS_ENVIRONMENT = MH_OBJ_DIR=@abs_builddir@ \
 ##
 ## Important note: the "cleanup" test should always be last
 ##
-TESTS = test/bad-input/test-header test/folder/test-create \
+TESTS = test/bad-input/test-header test/comp/test-comp-format \
+	test/folder/test-create \
 	test/folder/test-total test/format/test-localmbox \
 	test/format/test-myname test/format/test-myhost \
 	test/format/test-mymbox \
@@ -50,6 +51,7 @@ TESTS = test/bad-input/test-header test/folder/test-create \
 	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/sequences/test-flist test/sequences/test-mark \
 	test/whatnow/test-attach-detach test/whatnow/test-cd \
 	test/whatnow/test-ls \
 	test/cleanup ## The "cleanup" test should always be last.
@@ -143,6 +145,9 @@ dist_sysconf_DATA = etc/MailAliases etc/components etc/digestcomps \
 ##
 sysconf_DATA = etc/mhn.defaults etc/mts.conf
 
+##
+## Documentation that gets installed in docdir
+##
 dist_doc_DATA = COPYRIGHT VERSION docs/COMPLETION-BASH docs/COMPLETION-TCSH \
 		docs/COMPLETION-ZSH docs/DIFFERENCES docs/FAQ \
 		docs/MAIL.FILTERING docs/MAILING-LISTS docs/README-ATTACHMENTS \
@@ -221,7 +226,7 @@ uip_flist_SOURCES = uip/flist.c
 uip_folder_SOURCES = uip/folder.c
 
 uip_forw_SOURCES = uip/forw.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c \
-		   uip/annosbr.c uip/distsbr.c
+		   uip/annosbr.c uip/distsbr.c uip/forwsbr.c
 uip_forw_LDADD = $(LDADD) $(ICONVLIB)
 
 uip_inc_SOURCES = uip/inc.c uip/scansbr.c uip/dropsbr.c uip/termsbr.c \
@@ -457,8 +462,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)
@@ -486,8 +491,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' >> $@
@@ -534,6 +539,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
 
@@ -544,6 +550,7 @@ rpm: dist
 cscope:
 	echo "-I $(srcdir)/h -I $(srcdir)/sbr -I $(srcdir)/uip -I $(srcdir)/mts/smtp" > cscope.files
 	find $(srcdir) \( -name \*.c -o -name \*.l \) -print | grep -v dtimep.c >> cscope.files
+.PHONY: cscope
 
 ##
 ## Rules to upload the distribution to savannah