[Nano-devel] [PATCH 2/3] simplify man rules

[Mike Frysinger]

Use dist_ prefixes and += appending supported by automake to produce
simpler files.
---
 doc/man/Makefile.am    | 27 ++++++++++++---------------
 doc/man/fr/Makefile.am | 24 ++++++++++--------------
 2 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index a04710c..d360e10 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -1,25 +1,24 @@
-if USE_NLS
-SUBDIRS = fr
-else
 SUBDIRS =
+if USE_NLS
+SUBDIRS += fr
 endif
 
-if USE_NANORC
-man_MANS = nano.1 nanorc.5 rnano.1
+BUILT_SOURCES =
+dist_man_MANS = nano.1 rnano.1
+
 if GROFF_HTML
-BUILT_SOURCES = nano.1.html nanorc.5.html rnano.1.html
+BUILT_SOURCES += nano.1.html rnano.1.html
 endif
-else
-man_MANS = nano.1 rnano.1
+
+if USE_NANORC
+dist_man_MANS += nanorc.5
 if GROFF_HTML
-BUILT_SOURCES = nano.1.html rnano.1.html
+BUILT_SOURCES += nanorc.5.html
 endif
 endif
 
-nano_man_mans = nano.1 nanorc.5 rnano.1
 if GROFF_HTML
 dist_html_DATA = nano.1.html nanorc.5.html rnano.1.html
-nano_built_sources = nano.1.html nanorc.5.html rnano.1.html
 
 nano.1.html: nano.1
        groff -t -mandoc -Thtml < $? > $@
@@ -27,8 +26,6 @@ nanorc.5.html: nanorc.5
        groff -t -mandoc -Thtml < $? > $@
 rnano.1.html: rnano.1
        groff -t -mandoc -Thtml < $? > $@
-
-EXTRA_DIST = $(nano_man_mans) $(nano_built_sources)
-else 
-EXTRA_DIST = $(nano_man_mans)
 endif
+
+EXTRA_DIST = $(BUILT_SOURCES)
diff --git a/doc/man/fr/Makefile.am b/doc/man/fr/Makefile.am
index 6ae8921..47c9f8d 100644
--- a/doc/man/fr/Makefile.am
+++ b/doc/man/fr/Makefile.am
@@ -1,23 +1,22 @@
 mandir = @mandir@/fr
 htmldir = @htmldir@/fr
 
-if USE_NANORC
-man_MANS = nano.1 nanorc.5 rnano.1
+BUILT_SOURCES =
+dist_man_MANS = nano.1 rnano.1
+
 if GROFF_HTML
-BUILT_SOURCES = nano.1.html nanorc.5.html rnano.1.html
+BUILT_SOURCES += nano.1.html rnano.1.html
 endif
-else
-man_MANS = nano.1 rnano.1
+
+if USE_NANORC
+dist_man_MANS += nanorc.5
 if GROFF_HTML
-BUILT_SOURCES = nano.1.html rnano.1.html
+BUILT_SOURCES += nanorc.5.html
 endif
 endif
 
-nano_man_mans = nano.1 nanorc.5 rnano.1
 if GROFF_HTML
-html_DATA = nano.1.html nanorc.5.html rnano.1.html
-
-nano_built_sources = nano.1.html nanorc.5.html rnano.1.html
+dist_html_DATA = nano.1.html nanorc.5.html rnano.1.html
 
 nano.1.html: nano.1
        groff -t -mandoc -Thtml < $? > $@
@@ -25,9 +24,6 @@ nanorc.5.html: nanorc.5
        groff -t -mandoc -Thtml < $? > $@
 rnano.1.html: rnano.1
        groff -t -mandoc -Thtml < $? > $@
-
-EXTRA_DIST = $(nano_man_mans) $(nano_built_sources)
-else
-EXTRA_DIST = $(nano_man_mans)
 endif
 
+EXTRA_DIST = $(BUILT_SOURCES)
-- 
1.9.1