From: Will Estes <westes575@gmail.com>
Date: Tue, 18 Feb 2014 19:34:20 +0000 (-0500)
Subject: move m4 make variable to src/Makefile.am.
X-Git-Tag: v2.6.0~116
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5dbce367dca7bfd96ef347286cecb34cb71bf7d5;p=flex

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 e517a0f..076ccad 100644
--- 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 9cd7960..5353ebb 100644
--- 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 \