Back out M4 stuff in Makefile.am since it doesn't seem to be needed - wtf

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

diff --git a/ChangeLog b/ChangeLog
index ce516aef6a65dd43a111368de64668945bd9f57a..973234216ccd6a2bf7eb6738bb5d449e5dc880f6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,8 +27,6 @@ CVS code -
        - 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 e07c26d52110322e621c46d1c854c6b93969d270..921a20245be17be820e98954af9832ef74454560 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,5 @@
 ## $Id$
 AUTOMAKE_OPTIONS = gnu no-dependencies
-M4DIR = $(srcdir)/m4
-ACLOCAL_AMFLAGS = -I $(M4DIR)
 
 DEFS= -DSYSCONFDIR=\"$(sysconfdir)\"