From 0e39d7fe4a3484f5c5386e6fabc2cb8a65d7d92d Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Sun, 30 Mar 2014 20:14:36 +0000 Subject: [PATCH] Using 'dist_' prefixes and '+=' appending to produce simpler Automake files. Patch by Mike Frysinger. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4694 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 2 ++ doc/man/Makefile.am | 27 ++++++++++++--------------- doc/man/fr/Makefile.am | 24 ++++++++++-------------- 3 files changed, 24 insertions(+), 29 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1fafb905..44789128 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ * doc/Makefile.am, doc/man/Makefile.am, doc/man/fr/Makefile.am - The build already provides a standard htmldir for installing html files. Use that instead of creating our own. + * doc/man/Makefile.am, doc/man/fr/Makefile.am - Use dist_ prefixes + and += appending supported by automake to produce simpler files. 2014-03-27 Benno Schulenberg * src/nano.c (main) - Fix compilation with --disable-utf8. diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am index a04710c5..d360e10e 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 6ae89212..47c9f8d1 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) -- 2.39.5