From f62d1d0122fe00e0981e87344b132dc91ad03193 Mon Sep 17 00:00:00 2001
From: Edoardo Prezioso <edo88@email.it>
Date: Fri, 19 Aug 2011 00:28:31 +0200
Subject: [PATCH] Fixed #3017 (set HAVE_RULES to yes only if HAVE_RULES is
 undefined when executing make.)

---
 Makefile        | 4 +++-
 tools/dmake.cpp | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 4d1b52d51..db8cbd316 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,9 @@
 # This file is generated by tools/dmake, do not edit.
 
 # To compile without rules, use 'make HAVE_RULES=no'
-HAVE_RULES = yes
+ifndef HAVE_RULES
+    HAVE_RULES=yes
+endif
 
 ifndef CXXFLAGS
     CXXFLAGS=-Wall -Wextra -Wshadow -pedantic -Wno-long-long -Wfloat-equal -Wcast-qual -D_GLIBCXX_DEBUG -g
diff --git a/tools/dmake.cpp b/tools/dmake.cpp
index 1a1625862..c7745cb7c 100644
--- a/tools/dmake.cpp
+++ b/tools/dmake.cpp
@@ -218,8 +218,8 @@ int main(int argc, char **argv)
     }
 
     fout << "# This file is generated by tools/dmake, do not edit.\n\n";
-    fout << "# To compile without rules, use 'make HAVE_RULES=no'\n"
-         << "HAVE_RULES = yes\n\n";
+    fout << "# To compile without rules, use 'make HAVE_RULES=no'\n";
+    makeConditionalVariable(fout, "HAVE_RULES", "yes");
 
     // Makefile settings..
     if (release)