X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/94b8e5d6c0fff813de5da91558aaebf1df8c816e..19d2ce8fb85c0b52bafa37db46f8b4a3f05c87a3:/Makefile.am?ds=sidebyside diff --git a/Makefile.am b/Makefile.am index 46f7b904..af0c66a0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,18 +25,18 @@ MHNSEARCHPATH = "$(PATH)" MHNSEARCHPROG = $(srcdir)/etc/mhn.find.sh ## -## Automake doesn't let us install programs in $(libdir), so we create our -## own directory prefix to use in the primary variable. +## Install config files and back-end programs in our own subdirecctories. ## -auxexecdir = @libdir@ +nmhetcdir = @sysconfdir@/nmh +nmhlibexecdir = @libexecdir@/nmh ## ## nmh _does_ have a test suite! ## TESTS_ENVIRONMENT = MH_OBJ_DIR="@abs_builddir@" \ MH_TEST_DIR="@abs_builddir@/test/testdir" \ - auxexecdir="$(auxexecdir)" bindir="$(bindir)" \ - mandir="$(mandir)" sysconfdir="$(sysconfdir)" \ + nmhlibexecdir="$(nmhlibexecdir)" bindir="$(bindir)" \ + mandir="$(mandir)" nmhetcdir="$(nmhetcdir)" \ supported_locks="$(supported_locks)" \ default_locking="${default_locking}" \ MULTIBYTE_ENABLED=$(MULTIBYTE_ENABLED) \ @@ -52,8 +52,8 @@ TESTS = test/ali/test-ali test/anno/test-anno \ test/folder/test-create test/folder/test-packf \ test/folder/test-recurse test/folder/test-sortm \ test/folder/test-total \ - test/format/test-curses \ - test/format/test-dp test/format/test-fmtdump \ + test/format/test-curses test/format/test-dp \ + test/format/test-fmtdump test/format/test-functions \ test/format/test-localmbox test/format/test-myname \ test/format/test-myhost test/format/test-mymbox \ test/format/test-nullstr \ @@ -72,6 +72,7 @@ TESTS = test/ali/test-ali test/anno/test-anno \ test/mhbuild/test-forw test/mhbuild/test-header-encode \ test/mhbuild/test-utf8-body \ test/mhfixmsg/test-mhfixmsg \ + test/mhl/test-mhl-flags \ test/mhlist/test-mhlist test/mhlist/test-ext-params \ test/mhmail/test-mhmail \ test/mhparam/test-mhparam test/mhpath/test-mhpath \ @@ -109,7 +110,8 @@ DISTCHECK_CONFIGURE_FLAGS = DISABLE_SETGID_MAIL=1 ## CLEANFILES = config/version.c sbr/sigmsg.h sbr/dtimep.c etc/mts.conf \ etc/gen-ctype-checked sbr/ctype-checked.h sbr/ctype-checked.c \ - etc/mhn.defaults man/man.sed man/mh-chart.man $(man_MANS) + etc/mhn.defaults man/man.sed man/mh-chart.man $(man_MANS) \ + *.plist clean-local: @rm -rf RPM a.out.dSYM uip/a.out.dSYM @rm -rf test/testdir @@ -117,7 +119,7 @@ clean-local: ## ## Stuff that should be cleaned via "make maintainer-clean" ## -MAINTAINERCLEANFILES = cscope.files cscope.out cscope.in.out cscope.po.out +MAINTAINERCLEANFILES = atags cscope.files cscope.out cscope.in.out cscope.po.out *.plist ## ## And our own superclean, to get everything left by maintainer-clean. @@ -143,20 +145,20 @@ bin_PROGRAMS = uip/ali uip/anno uip/burst uip/comp uip/dist uip/flist \ uip/fmttest uip/folder uip/forw uip/inc uip/install-mh \ uip/mark uip/mhbuild uip/mhfixmsg uip/mhlist uip/mhn \ uip/mhparam uip/mhpath uip/mhshow uip/mhstore uip/msgchk \ - uip/msh uip/new uip/packf uip/pick uip/prompter uip/refile \ + uip/new uip/packf uip/pick uip/prompter uip/refile \ uip/repl uip/rmf uip/rmm uip/scan uip/send uip/show uip/sortm \ uip/whatnow uip/whom bin_SCRIPTS = uip/mhmail etc/sendfiles ## -## This is all programs that get installed in the "lib" directory +## This is all programs that get installed in the "libexec/nmh" directory ## -auxexec_PROGRAMS = uip/ap uip/dp uip/fmtdump uip/mhl uip/mkstemp \ +nmhlibexec_PROGRAMS = uip/ap uip/dp uip/fmtdump uip/mhl uip/mkstemp \ uip/post uip/rcvdist uip/rcvpack uip/rcvstore uip/rcvtty \ - uip/slocal uip/viamail uip/mhtest + uip/slocal uip/viamail -auxexec_SCRIPTS = uip/spost +nmhlibexec_SCRIPTS = uip/spost ## ## Programs that MAY need to get built at some point; we need to list them @@ -177,15 +179,15 @@ noinst_LIBRARIES = sbr/libmh.a mts/libmts.a ## noinst_HEADERS = h/addrsbr.h h/aliasbr.h h/crawl_folders.h h/dropsbr.h \ h/fmt_compile.h h/fmt_scan.h h/md5.h h/mf.h \ - h/mh.h h/mhcachesbr.h h/mhparse.h h/mime.h h/msh.h \ + h/mh.h h/mhcachesbr.h h/mhparse.h h/mime.h \ h/mts.h h/nmh.h h/picksbr.h h/popsbr.h h/prototypes.h \ h/rcvmail.h h/scansbr.h h/signals.h h/tws.h h/utils.h \ - h/vmhsbr.h mts/smtp/smtp.h sbr/ctype-checked.h + mts/smtp/smtp.h sbr/ctype-checked.h ## ## Extra files we need to install in various places ## -dist_sysconf_DATA = etc/MailAliases etc/components etc/digestcomps \ +dist_nmhetc_DATA = etc/MailAliases etc/components etc/digestcomps \ etc/distcomps etc/forwcomps etc/mhl.body etc/mhl.digest \ etc/mhl.format etc/mhl.forward etc/mhl.headers \ etc/mhl.reply etc/mhshow.marker etc/rcvdistcomps \ @@ -200,7 +202,7 @@ dist_sysconf_DATA = etc/MailAliases etc/components etc/digestcomps \ ## The same as above, but we don't include these in the distribution ## (because they're generated at compile time) ## -sysconf_DATA = etc/mhn.defaults etc/mts.conf +nmhetc_DATA = etc/mhn.defaults etc/mts.conf ## ## Documentation that gets installed in docdir @@ -217,8 +219,8 @@ dist_doc_DATA = COPYRIGHT INSTALL NEWS README VERSION \ ## Contribs that get installed in docdir/contrib/ ## contribdir = $(docdir)/contrib -dist_contrib_DATA = docs/contrib/replyfilter docs/contrib/build_nmh \ - docs/contrib/ml docs/contrib/vpick +dist_contrib_SCRIPTS = docs/contrib/replyfilter docs/contrib/build_nmh \ + docs/contrib/ml docs/contrib/vpick ## ## Our man pages @@ -232,7 +234,7 @@ man_MANS = man/ali.1 man/anno.1 man/ap.8 man/burst.1 man/comp.1 \ man/mh_profile.5 man/mh-sequence.5 man/mh-tailor.5 man/mhbuild.1 \ man/mhfixmsg.1 man/mhl.1 man/mhlist.1 man/mhmail.1 man/mhn.1 \ man/mhparam.1 man/mhpath.1 man/mhshow.1 man/mhstore.1 \ - man/mh-mkstemp.1 man/msgchk.1 man/msh.1 man/mts.conf.5 man/new.1 \ + man/mh-mkstemp.1 man/msgchk.1 man/mts.conf.5 man/new.1 \ man/next.1 man/nmh.7 man/packf.1 man/pick.1 man/post.8 man/prev.1 \ man/prompter.1 man/rcvdist.1 man/rcvpack.1 man/rcvstore.1 \ man/rcvtty.1 man/refile.1 man/repl.1 man/rmf.1 man/rmm.1 \ @@ -253,7 +255,7 @@ man_SRCS = man/ali.man man/anno.man man/ap.man man/burst.man man/comp.man \ man/mh-tailor.man man/mhbuild.man man/mhfixmsg.man man/mhl.man \ man/mhlist.man man/mhmail.man man/mhn.man man/mhparam.man \ man/mhpath.man man/mhshow.man man/mhstore.man man/mh-mkstemp.man \ - man/msgchk.man man/msh.man man/mts.conf.man man/new.man \ + man/msgchk.man man/mts.conf.man man/new.man \ man/next.man man/nmh.man man/packf.man man/pick.man man/post.man \ man/prev.man man/prompter.man man/rcvdist.man man/rcvpack.man \ man/rcvstore.man man/rcvtty.man man/refile.man man/repl.man \ @@ -265,7 +267,7 @@ man_SRCS = man/ali.man man/anno.man man/ap.man man/burst.man man/comp.man \ ## Files we need to include in the distribution which aren't found by ## Automake using the automatic rules ## -EXTRA_DIST = config/version.sh sbr/sigmsg.awk etc/mts.conf.in \ +EXTRA_DIST = autogen.sh config/version.sh sbr/sigmsg.awk etc/mts.conf.in \ etc/mhn.defaults.sh etc/sendfiles $(MHNSEARCHPROG) DATE MACHINES \ docs/ChangeLog_MH-3_to_MH-6.6 \ docs/ChangeLog_MH-6.7.0_to_MH-6.8.4.html \ @@ -273,6 +275,9 @@ EXTRA_DIST = config/version.sh sbr/sigmsg.awk etc/mts.conf.in \ test/inc/fromline.txt test/inc/msgheader.txt test/inc/filler.txt \ test/inc/md5sums test/mhmail/attachment.txt \ test/mhbuild/tiny.jpg \ + test/mhbuild/somebinary \ + test/mhbuild/nulls \ + test/mhbuild/textplain \ test/post/test-post-common.sh test/valgrind.supp uip/mhmail \ SPECS/nmh.spec SPECS/build-nmh-cygwin $(man_SRCS) @@ -359,10 +364,6 @@ uip_mhstore_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK) uip_msgchk_SOURCES = uip/msgchk.c uip/popsbr.c uip_msgchk_LDADD = $(LDADD) $(SASLLIB) $(POSTLINK) -uip_msh_SOURCES = uip/msh.c uip/mshcmds.c uip/vmhsbr.c uip/picksbr.c \ - uip/scansbr.c uip/dropsbr.c uip/mhlsbr.c -uip_msh_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK) - uip_new_SOURCES = uip/new.c uip_new_LDADD = $(LDADD) $(POSTLINK) @@ -409,7 +410,7 @@ uip_whom_SOURCES = uip/whom.c uip/distsbr.c uip_whom_LDADD = $(LDADD) $(POSTLINK) ## -## Programs definitions for all utilities that end up in $(libdir) +## Programs definitions for all utilities that end up in $(nmhlibexecdir) ## uip_ap_SOURCES = uip/ap.c @@ -427,11 +428,6 @@ uip_fmttest_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK) uip_mhl_SOURCES = uip/mhl.c uip/mhlsbr.c uip_mhl_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK) -uip_mhtest_SOURCES = uip/mhtest.c uip/mhparse.c uip/mhcachesbr.c \ - uip/mhoutsbr.c uip/mhmisc.c uip/mhfree.c \ - uip/md5.c -uip_mhtest_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK) - uip_mkstemp_SOURCES = uip/mkstemp.c uip_mkstemp_LDADD = $(LDADD) $(POSTLINK) @@ -482,8 +478,8 @@ etc_gen_ctype_checked_LDADD = $(POSTLINK) ## Hard-code the config/version.c target, instead of using $@, so this ## rule works for the distcheck target with Solaris (System V) make. ## distcheck uses VPATH, causes that make to prepend the VPATH to $@. -config/version.c: Makefile - sh $(srcdir)/config/version.sh $(VERSION) > ./config/version.c +config/version.c: Makefile config/version.sh + env srcdir="$(srcdir)" sh $(srcdir)/config/version.sh $(VERSION) > ./config/version.c sbr/sigmsg.h: $(srcdir)/sbr/sigmsg.awk $(SIGNAL_H) $(AWK) -f $(srcdir)/sbr/sigmsg.awk $(SIGNAL_H) > $@ @@ -552,8 +548,8 @@ uninstall-hook: ## Our rules to build our internal libraries (libmh.a, libmts.a) ## sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/arglist.c \ - sbr/base64.c \ - sbr/brkstring.c sbr/check_charset.c sbr/client.c \ + sbr/base64.c sbr/brkstring.c \ + sbr/charstring.c sbr/check_charset.c sbr/client.c \ sbr/closefds.c sbr/concat.c sbr/context_del.c \ sbr/context_find.c sbr/context_foil.c sbr/context_read.c \ sbr/context_replace.c sbr/context_save.c \ @@ -600,10 +596,10 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/arglist.c \ config/sbr_libmh_a-config.$(OBJEXT) sbr/sbr_libmh_a-mts.$(OBJEXT): Makefile -sbr_libmh_a_CPPFLAGS = -I./sbr -DNMHETCDIR='"$(sysconfdir)"' \ +sbr_libmh_a_CPPFLAGS = -I./sbr -DNMHETCDIR='"$(nmhetcdir)"' \ -DMAILSPOOL='"$(mailspool)"' \ -DSENDMAILPATH='"$(sendmailpath)"' -DNMHBINDIR='"$(bindir)"' \ - -DNMHLIBDIR='"$(libdir)"' + -DNMHLIBEXECDIR='"$(nmhlibexecdir)"' mts_libmts_a_SOURCES = mts/smtp/smtp.c @@ -621,10 +617,10 @@ $(man_MANS): man/man.sed man/man.sed: Makefile @echo 's,%nmhwarning%,THIS FILE HAS BEEN AUTOMATICALLY GENERATED. DO NOT EDIT.,g' > $@ @echo 's,%nmhversion%,nmh-$(VERSION),g' >> $@ + @echo 's,%nmhetcdir%,$(nmhetcdir),g' >> $@ + @echo 's,%nmhlibexecdir%,$(nmhlibexecdir),g' >> $@ @echo 's,%bindir%,$(bindir),g' >> $@ @echo 's,%docdir%,$(docdir),g' >> $@ - @echo 's,%etcdir%,$(sysconfdir),g' >> $@ - @echo 's,%libdir%,$(libdir),g' >> $@ @echo 's,%mandir%,$(mandir),g' >> $@ @echo 's,%mailspool%,$(mailspool),g' >> $@ @echo 's,%sendmailpath%,$(sendmailpath),g' >> $@