From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 30 Apr 2013 16:27:00 +0000 (+0200)
Subject: compat: restore support for $(INCLUDES) variable
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32109153c928454a97ec5cbffe3f6c7820721a9c;p=thirdparty%2Fautomake.git

compat: restore support for $(INCLUDES) variable

With the aim of avoiding the introduction of too much unneeded
differences and incompatibilities between Automake-NG and
mainline Automake.

See also commit v1.13.1b-166-g57c7200 (2013-04-19, compat: reinstate
support for obsolete $(INCLUDES) variable) in mainline Automake.

* automake.in (generate_makefile): The definition of the INCLUDES
variable now causes a warning in the 'obsolete' category rather than
a fatal error.

Suggested-by: Peter Rosin <peda@lysator.liu.se>
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

diff --git a/automake.in b/automake.in
index 17e833ef1..1bd994e55 100644
--- a/automake.in
+++ b/automake.in
@@ -6538,8 +6538,8 @@ sub generate_makefile
     }
   if (my $ovar = var ('INCLUDES'))
     {
-      reject_var $ovar,
-              "'INCLUDES' is obsolete; you should use 'AM_CPPFLAGS'"
+      msg_var 'obsolete', $ovar,
+              "'INCLUDES' is deprecated; you should use 'AM_CPPFLAGS'"
               . " (or '*_CPPFLAGS') instead"
     }