From 102e4feb8eb58ffc4d1515b6c04ea3e5a89a15a9 Mon Sep 17 00:00:00 2001
From: yangg <yangg@google.com>
Date: Tue, 6 Jan 2015 16:02:50 -0800
Subject: [PATCH] Use CONFIG after defining it. Define CONFIG before using it. 
 Change on 2015/01/06 by yangg <yangg@google.com> ------------- Created by
 MOE: http://code.google.com/p/moe-java MOE_MIGRATED_REVID=83383325

---
 Makefile                    | 11 +++++------
 templates/Makefile.template | 11 +++++------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 76fa9e153f4..49b0bd629de 100644
--- a/Makefile
+++ b/Makefile
@@ -49,16 +49,13 @@ CPPFLAGS_msan = -O1 -fsanitize=memory -fno-omit-frame-pointer
 LDFLAGS_msan = -fsanitize=memory
 DEFINES_msan = NDEBUG
 
-ifndef VALID_CONFIG_$(CONFIG)
-$(error Invalid CONFIG value '$(CONFIG)')
-endif
-
 # General settings.
 # You may want to change these depending on your system.
 
 prefix ?= /usr/local
 
 PROTOC = protoc
+CONFIG ?= opt
 CC = $(CC_$(CONFIG))
 CXX = $(CXX_$(CONFIG))
 LD = $(LD_$(CONFIG))
@@ -68,13 +65,15 @@ STRIP = strip --strip-unneeded
 INSTALL = install -D
 RM = rm -f
 
+ifndef VALID_CONFIG_$(CONFIG)
+$(error Invalid CONFIG value '$(CONFIG)')
+endif
+
 HOST_CC = $(CC)
 HOST_CXX = $(CXX)
 HOST_LD = $(LD)
 HOST_LDXX = $(LDXX)
 
-CONFIG ?= opt
-
 CPPFLAGS += $(CPPFLAGS_$(CONFIG))
 DEFINES += $(DEFINES_$(CONFIG))
 LDFLAGS += $(LDFLAGS_$(CONFIG))
diff --git a/templates/Makefile.template b/templates/Makefile.template
index 470ac0c2359..bdb97651145 100644
--- a/templates/Makefile.template
+++ b/templates/Makefile.template
@@ -65,16 +65,13 @@ CPPFLAGS_msan = -O1 -fsanitize=memory -fno-omit-frame-pointer
 LDFLAGS_msan = -fsanitize=memory
 DEFINES_msan = NDEBUG
 
-ifndef VALID_CONFIG_$(CONFIG)
-$(error Invalid CONFIG value '$(CONFIG)')
-endif
-
 # General settings.
 # You may want to change these depending on your system.
 
 prefix ?= /usr/local
 
 PROTOC = protoc
+CONFIG ?= opt
 CC = $(CC_$(CONFIG))
 CXX = $(CXX_$(CONFIG))
 LD = $(LD_$(CONFIG))
@@ -84,13 +81,15 @@ STRIP = strip --strip-unneeded
 INSTALL = install -D
 RM = rm -f
 
+ifndef VALID_CONFIG_$(CONFIG)
+$(error Invalid CONFIG value '$(CONFIG)')
+endif
+
 HOST_CC = $(CC)
 HOST_CXX = $(CXX)
 HOST_LD = $(LD)
 HOST_LDXX = $(LDXX)
 
-CONFIG ?= opt
-
 CPPFLAGS += $(CPPFLAGS_$(CONFIG))
 DEFINES += $(DEFINES_$(CONFIG))
 LDFLAGS += $(LDFLAGS_$(CONFIG))