From 29230a787b3a33455c51d37fc1052fc4157e4c60 Mon Sep 17 00:00:00 2001
From: djcb <djcb@djcbsoftware.nl>
Date: Sun, 7 Jun 2015 21:07:41 +0300
Subject: [PATCH] Install NEWS.org, mu4e-about.org

---
 Makefile.am      |  3 +++
 configure.ac     |  7 +++++++
 mu4e/Makefile.am | 13 ++++---------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index e5231221..7586e902 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -85,3 +85,6 @@ EXTRA_DIST=		\
 	NEWS		\
 	NEWS.org	\
 	autogen.sh
+
+doc_DATA =			\
+	NEWS.org
diff --git a/configure.ac b/configure.ac
index 218813b3..f09a0f0b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -226,6 +226,13 @@ AM_CONDITIONAL(HAVE_MAKEINFO, [test "x$have_makeinfo" = "xyes"])
 
 
 
+###############################################################################
+# docdir, so we can use it in mu4e-meta.el.in
+AC_SUBST(MU_DOC_DIR, "${prefix}/share/doc/mu")
+###############################################################################
+
+
+
 ###############################################################################
 # check for pmccabe
 AC_PATH_PROG([PMCCABE],[pmccabe],[no])
diff --git a/mu4e/Makefile.am b/mu4e/Makefile.am
index 816ad3f0..ffb5cfa8 100644
--- a/mu4e/Makefile.am
+++ b/mu4e/Makefile.am
@@ -22,7 +22,6 @@ info_TEXINFOS=mu4e.texi
 mu4e_TEXINFOS=fdl.texi
 
 dist_lisp_LISP=			\
-	mu4e-about.el		\
 	mu4e-actions.el		\
 	mu4e-compose.el		\
 	mu4e-contrib.el		\
@@ -31,7 +30,7 @@ dist_lisp_LISP=			\
 	mu4e-lists.el		\
 	mu4e-main.el		\
 	mu4e-mark.el		\
-	mu4e-message.el         \
+	mu4e-message.el		\
 	mu4e-meta.el		\
 	mu4e-proc.el		\
 	mu4e-speedbar.el	\
@@ -42,13 +41,9 @@ dist_lisp_LISP=			\
 	org-mu4e.el		\
 	org-old-mu4e.el
 
-mu4e-about.el: mu4e-about.org
-	@echo ";; auto-generated"           >   mu4e-about.el
-	@echo "(defconst mu4e-about \""     >>  mu4e-about.el
-	@sed 's/"/\\"/g' < mu4e-about.org   >>  mu4e-about.el
-	@echo "\" \"About mu4e.\")"         >>  mu4e-about.el
-	@echo "(provide 'mu4e-about)"       >>  mu4e-about.el
-
 EXTRA_DIST=$(elisp_DATA) mu4e-about.org
 
 CLEANFILES=*.elc ${BUILT_SOURCES}
+
+doc_DATA =			\
+	mu4e-about.org