diff --git a/ChangeLog b/ChangeLog index c6902e05f1278665c3ac8fc88cf9e2ae07222b14..ee2b7948a65ce7d80118cdbb3fdbf323e40e4a24 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2014-04-02 Mike Frysinger <vapier@gentoo.org> + * doc/man/{,fr}/Makefile.am: Simplify the man rules still further. + 2014-03-31 Chris Allegretta <chrisa@asty.org> * doc/syntax/go.nanorc: basic go syntax highlighting diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am index d360e10e50826f32f31f41f91099ad66b9d9d8ce..f7ad09a9e5e49b32c00dff62042e10f4498bc605 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 47c9f8d16ea4f846c66886e6b9a4c5b025214547..d8c2d18cc56e7eba32d221e03d1e2d6728836d81 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)