From a042407e94858610979446783be796ece5211cc7 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Tue, 3 Jun 2008 16:33:34 +0000
Subject: [PATCH] Revert "* Don't override environment variables in Makefile"

This reverts commit e60afb9e0d2b1f791399f91c5de626fe215d1d88.
---
 build/gccconfig.mk | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/build/gccconfig.mk b/build/gccconfig.mk
index 77bcf36744..0e4de2795f 100644
--- a/build/gccconfig.mk
+++ b/build/gccconfig.mk
@@ -1,22 +1,22 @@
 OS ?= $(shell uname)
 
-LUA_SHLIBS ?= $(shell pkg-config --silence-errors --libs lua5.1)
-LUA_LIBS ?= $(if $(LUA_SHLIBS),$(LUA_SHLIBS),$(firstword $(wildcard /usr/lib/liblua.a /usr/local/lib/liblua.a /opt/local/lib/liblua.a)))
-LUA_CFLAGS ?= $(shell pkg-config --silence-errors --cflags lua5.1)
+LUA_SHLIBS = $(shell pkg-config --silence-errors --libs lua5.1)
+LUA_LIBS = $(if $(LUA_SHLIBS),$(LUA_SHLIBS),$(firstword $(wildcard /usr/lib/liblua.a /usr/local/lib/liblua.a /opt/local/lib/liblua.a)))
+LUA_CFLAGS = $(shell pkg-config --silence-errors --cflags lua5.1)
 
-CC ?= gcc
-AR ?= ar
-RANLIB ?= ranlib
-CFLAGS ?= -O2
-FPIC ?= -fPIC
-EXTRA_CFLAGS ?= --std=gnu99
-WFLAGS ?= -Wall -Werror -pedantic
-CPPFLAGS ?=
-COMPILE ?= $(CC) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) $(WFLAGS)
+CC = gcc
+AR = ar
+RANLIB = ranlib
+CFLAGS = -O2
+FPIC = -fPIC
+EXTRA_CFLAGS = --std=gnu99
+WFLAGS = -Wall -Werror -pedantic
+CPPFLAGS =
+COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) $(WFLAGS)
 ifeq ($(OS),Darwin)
-  SHLIB_FLAGS ?= -bundle -undefined dynamic_lookup
+  SHLIB_FLAGS = -bundle -undefined dynamic_lookup
 else
-  SHLIB_FLAGS ?= -shared
+  SHLIB_FLAGS = -shared
 endif
-LINK ?= $(CC)
+LINK = $(CC)
 
-- 
2.30.2