move m4 make variable to src/Makefile.am.

This prevents an error when building skel.c caused by the $(m4) make
variable not being defined. Particularly nasty since skel.c would
still be created, thus causing make to think skel.c was up to date.

diff --git a/Makefile.am b/Makefile.am
index e517a0f16ecd38d01959ceffc95206ad700ea291..076ccad1a9ce34a934590c0b3224d31911f45aa6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,7 +34,6 @@
 # additional info.
 
 ACLOCAL_AMFLAGS = -I m4
-m4 = @M4@
 indent = @INDENT@
 
 dist_doc_DATA = \

diff --git a/src/Makefile.am b/src/Makefile.am
index 9cd79609729477dcdb11cb9925ca21dc8523c558..5353ebb1618bab279e49d9acc0bda35fc4e80b3b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,6 +3,8 @@ localedir = $(datadir)/locale
 AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl
 LIBS = @LIBINTL@ @LIBS@
 
+m4 = @M4@
+
 bin_PROGRAMS = flex
 lib_LTLIBRARIES = \
        libfl.la \