Commit e3016d90 authored by David Lawrence Ramsey's avatar David Lawrence Ramsey
Browse files

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
No related merge requests found
Showing with 7 additions and 2 deletions
+7 -2
...@@ -392,6 +392,11 @@ CVS code - ...@@ -392,6 +392,11 @@ CVS code -
- nano.texi: - nano.texi:
- Eliminate references to the now removed -D/--dos and -M/--mac - Eliminate references to the now removed -D/--dos and -M/--mac
command line options, and their corresponding toggles. (DLR) 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: - m4/glib-2.0.m4:
- New file imported from glib 2.4.7. This is needed to detect - 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, glib 2.x on systems that may not have it installed. (DLR,
......
...@@ -3,7 +3,6 @@ AUTOMAKE_OPTIONS = gnu no-dependencies ...@@ -3,7 +3,6 @@ AUTOMAKE_OPTIONS = gnu no-dependencies
SUBDIRS = doc m4 po src SUBDIRS = doc m4 po src
EXTRA_DIST = ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS \ EXTRA_DIST = ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS \
README THANKS TODO UPGRADE config.rpath install-sh missing \ README THANKS TODO UPGRADE config.rpath install-sh missing \
mkinstalldirs nano.spec mkinstalldirs nano.spec
......
info_TEXINFOS = nano.texi info_TEXINFOS = nano.texi
MAKEINFO = makeinfo --no-split MAKEINFO = makeinfo --no-split
EXTRA_DIST = nano.info EXTRA_DIST = nano.info
EXTRA_DIST = ulonglong.m4 intdiv0.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 \ 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 \ 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 \ lib-prefix.m4 codeset.m4 glibc21.m4 progtest.m4 gettext.m4 \
iconv.m4 lcmessage.m4 iconv.m4 lcmessage.m4 glib-2.0.m4
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment