From 055f0fbbe4c246becaf07c04cc1e634b962bfd59 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Wed, 2 Apr 2014 19:42:54 +0000 Subject: [PATCH] Simplifying the man rules still further. Patch by Mike Frysinger. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4701 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 3 +++ doc/man/Makefile.am | 19 ++++++++----------- doc/man/fr/Makefile.am | 17 +++++++---------- 3 files changed, 18 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index c6902e05..ee2b7948 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2014-04-02 Mike Frysinger + * doc/man/{,fr}/Makefile.am: Simplify the man rules still further. + 2014-03-31 Chris Allegretta * doc/syntax/go.nanorc: basic go syntax highlighting diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am index d360e10e..f7ad09a9 100644 --- a/doc/man/Makefile.am +++ b/doc/man/Makefile.am @@ -1,31 +1,28 @@ SUBDIRS = +BUILT_SOURCES = + if USE_NLS SUBDIRS += fr endif -BUILT_SOURCES = dist_man_MANS = nano.1 rnano.1 - -if GROFF_HTML -BUILT_SOURCES += nano.1.html rnano.1.html -endif +html_pages = nano.1.html rnano.1.html if USE_NANORC dist_man_MANS += nanorc.5 -if GROFF_HTML -BUILT_SOURCES += nanorc.5.html -endif +html_pages += nanorc.5.html endif -if GROFF_HTML -dist_html_DATA = nano.1.html nanorc.5.html rnano.1.html - 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 index 47c9f8d1..d8c2d18c 100644 --- a/doc/man/fr/Makefile.am +++ b/doc/man/fr/Makefile.am @@ -2,21 +2,14 @@ mandir = @mandir@/fr htmldir = @htmldir@/fr BUILT_SOURCES = -dist_man_MANS = nano.1 rnano.1 -if GROFF_HTML -BUILT_SOURCES += nano.1.html rnano.1.html -endif +dist_man_MANS = nano.1 rnano.1 +html_pages = nano.1.html rnano.1.html if USE_NANORC dist_man_MANS += nanorc.5 -if GROFF_HTML -BUILT_SOURCES += nanorc.5.html +html_pages += nanorc.5.html endif -endif - -if GROFF_HTML -dist_html_DATA = nano.1.html nanorc.5.html rnano.1.html nano.1.html: nano.1 groff -t -mandoc -Thtml < $? > $@ @@ -24,6 +17,10 @@ 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) -- 2.39.5