From c7c49c48da654fd201d0d336d21e7acab7ed5f30 Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey <pooka109@gmail.com> Date: Wed, 26 Jul 2006 17:42:16 +0000 Subject: [PATCH] in doc/Makefile.am, don't include nanorc.sample in EXTRA_DIST, as it's only useful when we're building from source, as opposed to building a distribution; also, tweak doc/Makefile.am and doc/man/Makefile.am to remove usage of the += operator again git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3819 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 7 +++++++ doc/Makefile.am | 8 ++++---- doc/man/Makefile.am | 6 +++--- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3a877c02..b68f3e81 100644 --- a/ChangeLog +++ b/ChangeLog @@ -182,6 +182,13 @@ CVS code - - If we use the --disable-wrapping option, ignore the --disable-wrapping-as-root option. (DLR) - Add minor cosmetic tweaks. (DLR) +- doc/Makefile.am: + - Don't include nanorc.sample in EXTRA_DIST, as it's only useful + when we're building from source, as opposed to building a + distribution. (DLR) + - Tweak to remove usage of the += operator again. (DLR) +- doc/man/Makefile.am: + - Tweak to remove usage of the += operator again. (DLR) - doc/faq.html: - Update section 5.3 again to not state "the latest development version" before 1.3.12, as it's no longer accurate. (DLR) diff --git a/doc/Makefile.am b/doc/Makefile.am index 761759fb..15f35ee6 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,7 +1,7 @@ -SUBDIRS = man texinfo - if USE_COLOR -SUBDIRS += syntax +SUBDIRS = man syntax texinfo +else +SUBDIRS = man texinfo endif -EXTRA_DIST = faq.html nanorc.sample +EXTRA_DIST = faq.html diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am index 560b721a..cf58ee2b 100644 --- a/doc/man/Makefile.am +++ b/doc/man/Makefile.am @@ -1,7 +1,7 @@ -SUBDIRS = - if USE_NLS -SUBDIRS += fr +SUBDIRS = fr +else +SUBDIRS = endif man_MANS = nano.1 nanorc.5 rnano.1 -- GitLab