Makefile.am: - Re-added M4DIR & ACLOCAL_AMFLAGS, make seems to fail without it Jordi ;-)

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

diff --git a/ChangeLog b/ChangeLog
index bd7fd321f0090381d2c2e1f94ba528da226d1f9f..77f2052e3039a1ffad22384858aaca8e06c4e12e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2CVS code -
+CVS code -
 - General
        - malloc->calloc, etc cleanups (DLR).
        - New option, noconvert (-N, --noconvert) to completely stop
@@ -27,6 +27,8 @@
        - Add SYSCONFDIR to DEFS, so we can have an /etc/nanorc.
        - Change localedir line to 1.0's version.
        - Moved m4/ stuff to its own m4/Makefile.am.
+       - Re-added M4DIR & ACLOCAL_AMFLAGS, make seems to fail without 
+         it Jordi ;-)
 - configure.in:
        - Renamed to configure.ac.
 - configure.ac:

diff --git a/Makefile.am b/Makefile.am
index 921a20245be17be820e98954af9832ef74454560..e07c26d52110322e621c46d1c854c6b93969d270 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,7 @@
 ## $Id$
 AUTOMAKE_OPTIONS = gnu no-dependencies
+M4DIR = $(srcdir)/m4
+ACLOCAL_AMFLAGS = -I $(M4DIR)
 
 DEFS= -DSYSCONFDIR=\"$(sysconfdir)\"