From 37f51515ed908191097717d1f804350bdbccfe73 Mon Sep 17 00:00:00 2001
From: djcb <djcb@djcbsoftware.nl>
Date: Sat, 20 Oct 2012 15:49:53 +0300
Subject: [PATCH] * fix guile / mu4e doc building

---
 Makefile.am             |  2 +-
 configure.ac            |  1 -
 guile/mu-guile.texi     |  2 +-
 guile/texi.texi.in      |  3 ---
 mu4e/Makefile.am        |  1 +
 {texi => mu4e}/fdl.texi |  0
 mu4e/mu4e.texi          |  2 +-
 mu4e/texi.texi.in       |  3 ---
 texi/Makefile.am        | 21 ---------------------
 9 files changed, 4 insertions(+), 31 deletions(-)
 rename {texi => mu4e}/fdl.texi (100%)
 delete mode 100644 texi/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6b856daa..b62f0b4f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,7 +28,7 @@ else
 mu4e=
 endif
 
-SUBDIRS=m4 texi man lib $(guile) mu $(mu4e) contrib toys
+SUBDIRS=m4 man lib $(guile) mu $(mu4e) contrib toys
 
 ACLOCAL_AMFLAGS=-I m4
 
diff --git a/configure.ac b/configure.ac
index 9fc539ca..cdd11848 100644
--- a/configure.ac
+++ b/configure.ac
@@ -305,7 +305,6 @@ AS_IF([test "x$PMCCABE" = "xno"],[
 
 AC_CONFIG_FILES([
 Makefile
-texi/Makefile
 mu/Makefile
 mu/tests/Makefile
 lib/Makefile
diff --git a/guile/mu-guile.texi b/guile/mu-guile.texi
index 2434fd71..8d327f2f 100644
--- a/guile/mu-guile.texi
+++ b/guile/mu-guile.texi
@@ -839,5 +839,5 @@ Frequency
 @node GNU Free Documentation License
 @appendix GNU Free Documentation License
 
-@include @value{texidir}/fdl.texi
+@include fdl.texi
 @bye
diff --git a/guile/texi.texi.in b/guile/texi.texi.in
index 5040426c..716d9a9f 100644
--- a/guile/texi.texi.in
+++ b/guile/texi.texi.in
@@ -1,6 +1,3 @@
-@c the version for mu for including in texinfo docs
-@set texidir @abs_top_srcdir@/texi
-
 @c the version for mu for including in texinfo docs
 @set mu-version @VERSION@
 
diff --git a/mu4e/Makefile.am b/mu4e/Makefile.am
index dc7cf921..49546c68 100644
--- a/mu4e/Makefile.am
+++ b/mu4e/Makefile.am
@@ -19,6 +19,7 @@ include $(top_srcdir)/gtest.mk
 SUBDIRS=
 
 info_TEXINFOS=mu4e.texi
+mu4e_TEXINFOS=fdl.texi
 
 lispdir=${prefix}/share/emacs/site-lisp/mu4e/
 
diff --git a/texi/fdl.texi b/mu4e/fdl.texi
similarity index 100%
rename from texi/fdl.texi
rename to mu4e/fdl.texi
diff --git a/mu4e/mu4e.texi b/mu4e/mu4e.texi
index e45c2a7b..ba2e9118 100644
--- a/mu4e/mu4e.texi
+++ b/mu4e/mu4e.texi
@@ -3128,6 +3128,6 @@ lines. @t{mu} itself keeps a log as well, you can find this it in
 @node GNU Free Documentation License
 @appendix GNU Free Documentation License
  
-@include @value{texidir}/fdl.texi
+@include fdl.texi
 
 @bye
diff --git a/mu4e/texi.texi.in b/mu4e/texi.texi.in
index 5040426c..716d9a9f 100644
--- a/mu4e/texi.texi.in
+++ b/mu4e/texi.texi.in
@@ -1,6 +1,3 @@
-@c the version for mu for including in texinfo docs
-@set texidir @abs_top_srcdir@/texi
-
 @c the version for mu for including in texinfo docs
 @set mu-version @VERSION@
 
diff --git a/texi/Makefile.am b/texi/Makefile.am
deleted file mode 100644
index a0d5c0a1..00000000
--- a/texi/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-## Copyright (C) 2012 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 3 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software Foundation,
-## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-include $(top_srcdir)/gtest.mk
-
-EXTRA_DIST=		\
-	version.texi.in \
-	fdl.texi