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

@@ -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)

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

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