summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEduardo Chappa <chappa@washington.edu>2020-01-09 23:03:01 -0700
committerEduardo Chappa <chappa@washington.edu>2020-01-09 23:03:01 -0700
commitbeffee2b2fefca29b820b48e1395231d88b4b70d (patch)
treee92c2fbd23d7ab6334f5f75c0c03ad70341fe23c
parentef4518e9aad321a6b6f7af940bbccdbcf42595d0 (diff)
downloadalpine-beffee2b2fefca29b820b48e1395231d88b4b70d.tar.xz
* When Alpine is built with the option --with-bundled-tools, the "make
install" command will also install the mailutil program. Feature contributed by Professor Ryan Elliot.
-rw-r--r--Makefile.am6
-rw-r--r--Makefile.in26
-rw-r--r--imap/Makefile18
3 files changed, 40 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am
index 2fec6e34..292c6c9f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,3 +38,9 @@ clean-local:
man_MANS = doc/man1/alpine.1 doc/man1/pico.1 doc/man1/pilot.1 doc/man1/rpdump.1 doc/man1/rpload.1
ACLOCAL_AMFLAGS = --install -I m4
+
+install-exec-local:
+ cd imap && $(MAKE) install-mailutil BUNDLED="$(C_CLIENT_BUNDLED)" DESTDIR="$(DESTDIR)" bindir="$(bindir)" mandir="$(mandir)"
+
+uninstall-local:
+ cd imap && $(MAKE) uninstall-mailutil BUNDLED="$(C_CLIENT_BUNDLED)" DESTDIR="$(DESTDIR)" bindir="$(bindir)" mandir="$(mandir)"
diff --git a/Makefile.in b/Makefile.in
index a41bdfa5..e1bb7b17 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -883,7 +883,7 @@ install-dvi: install-dvi-recursive
install-dvi-am:
-install-exec-am:
+install-exec-am: install-exec-local
install-html: install-html-recursive
@@ -923,7 +923,7 @@ ps: ps-recursive
ps-am:
-uninstall-am: uninstall-man
+uninstall-am: uninstall-local uninstall-man
uninstall-man: uninstall-man1
@@ -939,14 +939,14 @@ uninstall-man: uninstall-man1
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-am \
install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-man1 \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- installdirs-am maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
- ps ps-am tags tags-am uninstall uninstall-am uninstall-man \
- uninstall-man1
+ install-exec install-exec-am install-exec-local install-html \
+ install-html-am install-info install-info-am install-man \
+ install-man1 install-pdf install-pdf-am install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+ uninstall-am uninstall-local uninstall-man uninstall-man1
.PHONY: c-client.d c-client gssapi_proxy.l
@@ -964,6 +964,12 @@ gssapi_proxy.l:
clean-local:
cd imap && $(MAKE) clean
+install-exec-local:
+ cd imap && $(MAKE) install-mailutil BUNDLED="$(C_CLIENT_BUNDLED)" DESTDIR="$(DESTDIR)" bindir="$(bindir)" mandir="$(mandir)"
+
+uninstall-local:
+ cd imap && $(MAKE) uninstall-mailutil BUNDLED="$(C_CLIENT_BUNDLED)" DESTDIR="$(DESTDIR)" bindir="$(bindir)" mandir="$(mandir)"
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/imap/Makefile b/imap/Makefile
index 52ce3782..46807616 100644
--- a/imap/Makefile
+++ b/imap/Makefile
@@ -282,6 +282,7 @@ SH=sh
SYSTEM=unix
TOOLS=tools
TOUCH=touch
+INSTALL=install
# Primary build command
@@ -726,6 +727,23 @@ bundled:
$(CD) dmail;$(MAKE) || true
$(CD) tmail;$(MAKE) || true
+install-mailutil: bundled$(BUNDLED)
+ @echo Installing mailutil...
+ @echo BUNDLED=$(BUNDLED)
+ if test x"$(BUNDLED)" = x""; then \
+ $(INSTALL) -d $(DESTDIR)$(bindir); \
+ $(INSTALL) mailutil/mailutil $(DESTDIR)$(bindir)/mailutil; \
+ $(INSTALL) -d $(DESTDIR)$(mandir)/man1; \
+ $(INSTALL) src/mailutil/mailutil.1 $(DESTDIR)$(mandir)/man1/mailutil.1; \
+ fi
+
+uninstall-mailutil:
+ @echo Uninstalling mailutil...
+ @echo BUNDLED=$(BUNDLED)
+ if test x"$(BUNDLED)" = x""; then \
+ $(RM) $(DESTDIR)$(bindir)/mailutil; \
+ $(RM) $(DESTDIR)$(mandir)/man1/mailutil.1; \
+ fi
sysexitwarn:
@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++