## We set this to get our autoconf macros in the m4 directory
ACLOCAL_AMFLAGS = -I m4
+AM_YFLAGS = -d
+
##
## This is the default set of libraries all programs link against. Some
## programs add extra libraries to this set, so they override this with
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)" \
+ nmhetcdirinst="@nmhetcdirinst@$(nmhetcdir)" \
supported_locks="$(supported_locks)" \
default_locking="${default_locking}" \
MULTIBYTE_ENABLED=$(MULTIBYTE_ENABLED) \
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 \
test/mhbuild/test-ext-params \
test/mhbuild/test-forw test/mhbuild/test-header-encode \
test/mhbuild/test-utf8-body \
- test/mhfixmsg/test-mhfixmsg \
+ test/mhfixmsg/test-mhfixmsg test/mhical/test-mhical \
+ 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 \
test/post/test-post-group test/post/test-mts test/post/test-messageid \
test/post/test-sendfiles test/prompter/test-prompter \
test/rcv/test-rcvdist test/rcv/test-rcvpack test/rcv/test-rcvstore \
- test/rcv/test-rcvtty test/refile/test-refile \
+ test/rcv/test-rcvtty test/refile/test-refile test/repl/test-convert \
test/repl/test-if-str test/repl/test-trailing-newline \
test/repl/test-multicomp test/repl/test-repl \
test/scan/test-scan test/scan/test-scan-multibyte \
test/sequences/test-flist test/sequences/test-mark \
test/sequences/test-out-of-range \
+ test/show/test-show \
test/slocal/test-slocal \
test/whatnow/test-attach-detach test/whatnow/test-cd \
test/whatnow/test-ls test/whom/test-whom \
check_SCRIPTS = test/common.sh
check_PROGRAMS = test/getfullname test/getcanon test/fakepop test/fakesmtp \
test/getcwidth
-DISTCHECK_CONFIGURE_FLAGS = DISABLE_SETGID_MAIL=1
+
+## The location of installed nmhetcdir is, for all purposes except
+## distcheck, $nmhetcdir. For distcheck, prepend $MH_INST_DIR (from
+## test/common.sh.in), which is based on $MH_TEST_DIR (from
+## $TESTS_ENVIRONMENT).
+DISTCHECK_CONFIGURE_FLAGS = DISABLE_SETGID_MAIL=1 \
+ NMHETCDIRINST='$${abs_builddir}/test/testdir/inst'
##
## Stuff that should be cleaned via "make clean"
## automake 1.12.6 on FreeBSD 9 needs the sbr/dtimep.c.
##
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/gen-ctype-checked sbr/ctype-checked.[hc] \
etc/mhn.defaults man/man.sed man/mh-chart.man $(man_MANS) \
*.plist
clean-local:
##
## Stuff that should be cleaned via "make maintainer-clean"
##
-MAINTAINERCLEANFILES = cscope.files cscope.out cscope.in.out cscope.po.out *.plist
+MAINTAINERCLEANFILES = atags cscope.files cscope.out cscope.in.out cscope.po.out *.plist
##
## And our own superclean, to get everything left by maintainer-clean.
##
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/mark uip/mhbuild uip/mhfixmsg uip/mhical uip/mhlist uip/mhn \
uip/mhparam uip/mhpath uip/mhshow uip/mhstore uip/msgchk \
uip/new uip/packf uip/pick uip/prompter uip/refile \
uip/repl uip/rmf uip/rmm uip/scan uip/send uip/show uip/sortm \
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
-auxexec_SCRIPTS = uip/spost
+nmhlibexec_SCRIPTS = uip/spost
##
## Programs that MAY need to get built at some point; we need to list them
## them, but that might change in the future.
##
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/fmt_compile.h h/fmt_scan.h h/icalendar.h h/md5.h h/mf.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 \
##
## Extra files we need to install in various places
##
-dist_sysconf_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 \
- etc/rcvdistcomps.outbox etc/replcomps etc/replgroupcomps \
- etc/scan.MMDDYY \
- etc/scan.YYYYMMDD etc/scan.curses etc/scan.default \
- etc/scan.highlighted \
- etc/scan.mailx etc/scan.nomime etc/scan.size etc/scan.time \
- etc/scan.timely etc/scan.unseen
+dist_nmhetc_DATA = etc/MailAliases etc/components etc/digestcomps \
+ etc/distcomps etc/forwcomps \
+ etc/mhical.12hour etc/mhical.24hour \
+ etc/mhl.body etc/mhl.digest etc/mhl.format etc/mhl.forward \
+ etc/mhl.headers etc/mhl.reply etc/mhl.replywithoutbody \
+ etc/mhshow.marker etc/rcvdistcomps etc/rcvdistcomps.outbox \
+ etc/replcomps etc/replgroupcomps \
+ etc/scan.MMDDYY \
+ etc/scan.YYYYMMDD etc/scan.curses etc/scan.default \
+ etc/scan.highlighted \
+ etc/scan.mailx etc/scan.nomime etc/scan.size etc/scan.time \
+ etc/scan.timely etc/scan.unseen
##
## 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
docs/MAIL.FILTERING docs/MAILING-LISTS docs/README-ATTACHMENTS \
docs/README-HOOKS docs/README-components docs/README.about \
docs/README.SASL docs/README.developers docs/README.manpages \
- docs/README-iCalendar docs/TODO
+ docs/TODO
##
## 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
+dist_contrib_DATA = docs/contrib/replaliases
##
## Our man pages
man/mh-alias.5 man/mh-chart.7 man/mh-draft.5 man/mh-folders.5 \
man/mh-format.5 man/mh-mail.5 man/mh-mime.7 man/mh-profile.5 \
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/mhfixmsg.1 man/mhical.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/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/mh-chart-gen.sh man/mh-draft.man man/mh-folders.man \
man/mh-format.man man/mh-mail.man man/mh-mime.man \
man/mh-profile.man man/mh_profile.man man/mh-sequence.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/mts.conf.man man/new.man \
+ man/mh-tailor.man man/mhbuild.man man/mhfixmsg.man man/mhical.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/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 \
## Files we need to include in the distribution which aren't found by
## Automake using the automatic rules
##
-EXTRA_DIST = autogen.sh config/version.sh sbr/sigmsg.awk etc/mts.conf.in \
- etc/mhn.defaults.sh etc/sendfiles $(MHNSEARCHPROG) DATE MACHINES \
+EXTRA_DIST = autogen.sh config/version.sh sbr/sigmsg.awk sbr/icalparse.h \
+ 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 \
test/README test/fakesendmail $(TESTS) test/inc/deb359167.mbox \
uip_mhbuild_SOURCES = uip/mhbuild.c uip/mhbuildsbr.c uip/mhcachesbr.c \
uip/mhlistsbr.c uip/mhoutsbr.c uip/mhmisc.c \
- uip/mhfree.c uip/mhparse.c uip/md5.c
+ uip/mhfree.c uip/mhparse.c uip/md5.c \
+ uip/mhstoresbr.c uip/mhshowsbr.c
uip_mhbuild_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
uip_mhfixmsg_SOURCES = uip/mhfixmsg.c uip/mhparse.c uip/mhcachesbr.c \
uip/mhshowsbr.c uip/mhlistsbr.c uip/md5.c
uip_mhfixmsg_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
+uip_mhical_SOURCES = uip/mhical.c
+uip_mhical_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
+
uip_mhlist_SOURCES = uip/mhlist.c uip/mhparse.c uip/mhcachesbr.c \
uip/mhlistsbr.c uip/mhmisc.c uip/mhfree.c uip/md5.c
uip_mhlist_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
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
## 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 $(srcdir)/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) > $@
## 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 \
sbr/getcpy.c sbr/geteditor.c sbr/getfolder.c \
sbr/getpass.c \
sbr/fmt_addr.c sbr/fmt_compile.c sbr/fmt_new.c \
- sbr/fmt_rfc2047.c sbr/fmt_scan.c sbr/lock_file.c \
+ sbr/fmt_rfc2047.c sbr/fmt_scan.c \
+ sbr/icalparse.y sbr/icalendar.l sbr/datetime.c \
+ sbr/lock_file.c \
sbr/m_atoi.c sbr/m_backup.c sbr/m_convert.c \
sbr/m_draft.c sbr/m_getfld.c sbr/m_gmprot.c \
sbr/m_maildir.c sbr/m_name.c sbr/m_popen.c sbr/m_rand.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='"@nmhetcdirinst@$(nmhetcdir)"' \
-DMAILSPOOL='"$(mailspool)"' \
-DSENDMAILPATH='"$(sendmailpath)"' -DNMHBINDIR='"$(bindir)"' \
- -DNMHLIBDIR='"$(libdir)"'
+ -DNMHLIBEXECDIR='"$(nmhlibexecdir)"'
mts_libmts_a_SOURCES = mts/smtp/smtp.c
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' >> $@
projects / nmh / blobdiff