in m4/Makefile.am, add glib-2.0.m4 to EXTRA_DIST, so that nano builds

from CVS with automake 1.7.x again; for some reason, automake 1.9.x
didn't have a problem with its (erroneously) being left out; also add
some formatting fixes to other Makefile.am's dealing with too many or
too few blank lines

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2089 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index 20f3b08fea291a74d50bbc6c7748144a4345ccc0..bf43c6b241b972c6546762f4e36f46157aa25174 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -392,6 +392,11 @@ CVS code -
 - nano.texi:
        - Eliminate references to the now removed -D/--dos and -M/--mac
          command line options, and their corresponding toggles. (DLR)
+- m4/Makefile.am:
+       - Add glib-2.0.m4 to EXTRA_DIST, so that nano builds from CVS
+         with automake 1.7.x again.  For some reason, automake 1.9.x
+         didn't have a problem with its (erroneously) being left out.
+         (DLR, problem found by Chris)
 - m4/glib-2.0.m4:
        - New file imported from glib 2.4.7.  This is needed to detect
          glib 2.x on systems that may not have it installed. (DLR,

diff --git a/Makefile.am b/Makefile.am
index 1b771f27c06dec7730f67e7f32ce1449e0352e32..4331fe05acc37f62d71ccae37d817507eb28f352 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,6 @@ AUTOMAKE_OPTIONS = gnu no-dependencies
 
 SUBDIRS = doc m4 po src
 
-
 EXTRA_DIST =   ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS \
                README THANKS TODO UPGRADE config.rpath install-sh missing \
                mkinstalldirs nano.spec

diff --git a/doc/texinfo/Makefile.am b/doc/texinfo/Makefile.am
index d2251ae3d1817d0bc9b50631e13869184a3b41d0..326772081bc68db16693f41d513d2de6b3068dcd 100644 (file)
--- a/doc/texinfo/Makefile.am
+++ b/doc/texinfo/Makefile.am
@@ -1,4 +1,5 @@
 info_TEXINFOS = nano.texi
+
 MAKEINFO = makeinfo --no-split
 
 EXTRA_DIST = nano.info

diff --git a/m4/Makefile.am b/m4/Makefile.am
index 79ce4f04f5db84b3964cd0c482c6f927aff717ce..f7187c250feb4c94904b917bd0d9a2b3e88077cf 100644 (file)
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -1,4 +1,4 @@
 EXTRA_DIST = ulonglong.m4 intdiv0.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 \
             stdint_h.m4 uintmax_t.m4 isc-posix.m4 lib-ld.m4 lib-link.m4 \
             lib-prefix.m4 codeset.m4 glibc21.m4 progtest.m4 gettext.m4 \
-            iconv.m4 lcmessage.m4
+            iconv.m4 lcmessage.m4 glib-2.0.m4