[Nano-devel] [PATCH 1/3] build: move all documentation into a single directory

[Benno Schulenberg]

There are just a handful of source files for the documentation --
it is wasteful and cumbersome to have these in separate directories.

Also: remove the French man pages -- they are too far out of date.
(And anyway, we should acquire a general framework for translating
the documentation.)
---
 configure.ac                |   3 -
 doc/.gitignore              |   6 +
 doc/Makefile.am             |  38 ++++-
 doc/man/.gitignore          |   3 -
 doc/man/Makefile.am         |  28 ----
 doc/man/fr/Makefile.am      |  26 ---
 doc/man/fr/nano.1           | 324 --------------------------------------
 doc/man/fr/nanorc.5         | 374 --------------------------------------------
 doc/man/fr/rnano.1          | 152 ------------------
 doc/{man => }/nano.1        |   0
 doc/{texinfo => }/nano.texi |   0
 doc/{man => }/nanorc.5      |   0
 doc/{man => }/rnano.1       |   0
 doc/texinfo/.gitignore      |   3 -
 doc/texinfo/Makefile.am     |  10 --
 15 files changed, 39 insertions(+), 928 deletions(-)
 delete mode 100644 doc/man/.gitignore
 delete mode 100644 doc/man/Makefile.am
 delete mode 100644 doc/man/fr/Makefile.am
 delete mode 100644 doc/man/fr/nano.1
 delete mode 100644 doc/man/fr/nanorc.5
 delete mode 100644 doc/man/fr/rnano.1
 rename doc/{man => }/nano.1 (100%)
 rename doc/{texinfo => }/nano.texi (100%)
 rename doc/{man => }/nanorc.5 (100%)
 rename doc/{man => }/rnano.1 (100%)
 delete mode 100644 doc/texinfo/.gitignore
 delete mode 100644 doc/texinfo/Makefile.am

diff --git a/configure.ac b/configure.ac
index fdf0d40d..63942a84 100644
--- a/configure.ac
+++ b/configure.ac
@@ -752,10 +752,7 @@ AC_CONFIG_FILES([
 Makefile
 doc/Makefile
 doc/nanorc.sample
-doc/man/Makefile
-doc/man/fr/Makefile
 doc/syntax/Makefile
-doc/texinfo/Makefile
 m4/Makefile
 po/Makefile.in
 src/Makefile
diff --git a/doc/.gitignore b/doc/.gitignore
index a2acc8dd..da6439a8 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1 +1,7 @@
 /nanorc.sample
+nano.1.html
+rnano.1.html
+nanorc.5.html
+texinfo.tex
+nano.info
+nano.html
diff --git a/doc/Makefile.am b/doc/Makefile.am
index c197ceb0..cac1d8d4 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,11 +1,39 @@
-SUBDIRS = man
-
-if HAVE_MAKEINFO
-SUBDIRS += texinfo
-endif
+SUBDIRS =
+BUILT_SOURCES =
 
 if USE_COLOR
 SUBDIRS += syntax
 endif
 
 dist_html_DATA = faq.html
+
+dist_man_MANS = nano.1 rnano.1
+html_pages = nano.1.html rnano.1.html
+
+if USE_NANORC
+dist_man_MANS += nanorc.5
+html_pages += nanorc.5.html
+endif
+
+nano.1.html: nano.1
+       groff -t -mandoc -Thtml < $? > $@
+nanorc.5.html: nanorc.5
+       groff -t -mandoc -Thtml < $? > $@
+rnano.1.html: rnano.1
+       groff -t -mandoc -Thtml < $? > $@
+
+if GROFF_HTML
+BUILT_SOURCES += $(html_pages)
+dist_html_DATA += $(html_pages)
+endif
+
+info_TEXINFOS = nano.texi
+
+if HAVE_MAKEINFO
+BUILT_SOURCES += nano.html
+endif
+
+nano.html: nano.texi
+       makeinfo --no-split --html < $< > $@
+
+EXTRA_DIST = $(BUILT_SOURCES) $(info_TEXINFOS)
diff --git a/doc/man/.gitignore b/doc/man/.gitignore
deleted file mode 100644
index 97e8d5b3..00000000
--- a/doc/man/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-nano.1.html
-nanorc.5.html
-rnano.1.html
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
deleted file mode 100644
index f7ad09a9..00000000
--- a/doc/man/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-SUBDIRS =
-BUILT_SOURCES =
-
-if USE_NLS
-SUBDIRS += fr
-endif
-
-dist_man_MANS = nano.1 rnano.1
-html_pages = nano.1.html rnano.1.html
-
-if USE_NANORC
-dist_man_MANS += nanorc.5
-html_pages += nanorc.5.html
-endif
-
-nano.1.html: nano.1
-       groff -t -mandoc -Thtml < $? > $@
-nanorc.5.html: nanorc.5
-       groff -t -mandoc -Thtml < $? > $@
-rnano.1.html: rnano.1
-       groff -t -mandoc -Thtml < $? > $@
-
-if GROFF_HTML
-BUILT_SOURCES += $(html_pages)
-dist_html_DATA = $(html_pages)
-endif
-
-EXTRA_DIST = $(BUILT_SOURCES)
diff --git a/doc/man/fr/Makefile.am b/doc/man/fr/Makefile.am
deleted file mode 100644
index d8c2d18c..00000000
--- a/doc/man/fr/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-mandir = @mandir@/fr
-htmldir = @htmldir@/fr
-
-BUILT_SOURCES =
-
-dist_man_MANS = nano.1 rnano.1
-html_pages = nano.1.html rnano.1.html
-
-if USE_NANORC
-dist_man_MANS += nanorc.5
-html_pages += nanorc.5.html
-endif
-
-nano.1.html: nano.1
-       groff -t -mandoc -Thtml < $? > $@
-nanorc.5.html: nanorc.5
-       groff -t -mandoc -Thtml < $? > $@
-rnano.1.html: rnano.1
-       groff -t -mandoc -Thtml < $? > $@
-
-if GROFF_HTML
-BUILT_SOURCES += $(html_pages)
-dist_html_DATA = $(html_pages)
-endif
-
-EXTRA_DIST = $(BUILT_SOURCES)
diff --git a/doc/man/nano.1 b/doc/nano.1
similarity index 100%
rename from doc/man/nano.1
rename to doc/nano.1
diff --git a/doc/texinfo/nano.texi b/doc/nano.texi
similarity index 100%
rename from doc/texinfo/nano.texi
rename to doc/nano.texi
diff --git a/doc/man/nanorc.5 b/doc/nanorc.5
similarity index 100%
rename from doc/man/nanorc.5
rename to doc/nanorc.5
diff --git a/doc/man/rnano.1 b/doc/rnano.1
similarity index 100%
rename from doc/man/rnano.1
rename to doc/rnano.1
diff --git a/doc/texinfo/.gitignore b/doc/texinfo/.gitignore
deleted file mode 100644
index 9fa0ed48..00000000
--- a/doc/texinfo/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-texinfo.tex
-nano.html
-nano.info
diff --git a/doc/texinfo/Makefile.am b/doc/texinfo/Makefile.am
deleted file mode 100644
index 91f01636..00000000
--- a/doc/texinfo/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-info_TEXINFOS = nano.texi
-
-MAKEINFO = makeinfo --no-split
-
-BUILT_SOURCES = nano.html
-
-nano.html: nano.texi
-       makeinfo --no-split --html < $< > $@
-
-EXTRA_DIST = $(info_TEXINFOS) $(BUILT_SOURCES)
-- 
2.11.0