From 6fde5cdf2222796d923cf1e88bb29d244d19361c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= <mat@brain-dump.org>
Date: Tue, 27 Oct 2015 10:11:40 +0100
Subject: build: merge parts of the build system changes from lua branch

Should hopefully fix build on Mac OS X.
---
 Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index b34cb72..142ec01 100644
--- a/Makefile
+++ b/Makefile
@@ -8,14 +8,14 @@ config.h:
 	cp config.def.h config.h
 
 vis: config.h config.mk *.c *.h
-	@echo ${CC} ${CFLAGS} *.c ${LDFLAGS} -o $@
-	@${CC} ${CFLAGS} *.c ${LDFLAGS} -o $@
+	@echo ${CC} ${CFLAGS} ${CFLAGS_VIS} *.c ${LDFLAGS} ${LDFLAGS_VIS} -o $@
+	@${CC} ${CFLAGS} ${CFLAGS_VIS} *.c ${LDFLAGS} ${LDFLAGS_VIS} -o $@
 
 debug: clean
-	@$(MAKE) CFLAGS='${DEBUG_CFLAGS}'
+	@$(MAKE) CFLAGS_VIS='${DEBUG_CFLAGS_VIS}'
 
 profile: clean
-	@$(MAKE) CFLAGS='${DEBUG_CFLAGS} -pg'
+	@$(MAKE) CFLAGS_VIS='${DEBUG_CFLAGS_VIS} -pg'
 
 clean:
 	@echo cleaning
-- 
cgit v1.2.3