From f02e32793d3bca6d88116d352bd733e278af7584 Mon Sep 17 00:00:00 2001
From: Dan Buch <daniel.buch@gmail.com>
Date: Tue, 27 Dec 2016 11:43:21 -0500
Subject: [PATCH] More make and CI bits tweaks

---
 .travis.yml | 11 ++++++++---
 Makefile    |  8 ++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b6834a8..18d24a0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,10 +6,15 @@ cache:
 compiler:
 - gcc
 - clang
-install: 'true'
+env:
+  global:
+  - EXTRAFLAGS=
+  - PREFIX="${HOME}"
+install:
+- 'true'
 script:
 - make
 - ./mcrcon -h
 - ./mcrcon -v
-- make install PREFIX="${HOME}"
-- make uninstall PREFIX="${HOME}"
+- make install
+- make uninstall
diff --git a/Makefile b/Makefile
index 4d653d1..4dc0aee 100644
--- a/Makefile
+++ b/Makefile
@@ -6,10 +6,10 @@
 EXENAME = mcrcon
 PREFIX ?= /usr/local
 
-CFLAGS = -std=gnu99 -Wall -Wextra -Wpedantic -Os -s
-EXTRAFLAGS = -fstack-protector-strong
+CFLAGS ?= -std=gnu99 -Wall -Wextra -Wpedantic -Os -s
+EXTRAFLAGS ?= -fstack-protector-strong
 
-CC = gcc
+CC ?= gcc
 INSTALL = install
 LINKER =
 RM = rm -f
@@ -22,7 +22,7 @@ endif
 
 ifeq ($(shell uname), Darwin)
 	INSTALL = ginstall
-	CFLAGS = -std=gnu99 -Wall -Wextra -Wpedantic -Os
+	CFLAGS ?= -std=gnu99 -Wall -Wextra -Wpedantic -Os
 endif
 
 .PHONY: all