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

diff --git a/ChangeLog b/ChangeLog
index 3a877c02001557ae1def92ac3f7916e4c9e4fdf0..b68f3e81560767cb22ecbe702ec04417aa48fd9e 100644 (file)
--- 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 761759fbd0e047fff1ccda70d4f4919e8790e56d..15f35ee6b666938245bbe61a1b6990c3e2adae66 100644 (file)
--- 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 560b721a11a5c750355a40ad605ebce143bae60c..cf58ee2b0cc846546fb6041ea94ebcdc160b6aa5 100644 (file)
--- 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