From 0198ca77a799bd7db6f799be37180c90216ebf67 Mon Sep 17 00:00:00 2001
From: Dan Buch <daniel.buch@gmail.com>
Date: Mon, 26 Dec 2016 22:12:00 -0500
Subject: [PATCH] Touchups for MacOS

---
 INSTALL => INSTALL.md |  0
 Makefile              | 42 +++++++++++++++++++++++++++---------------
 mcrcon.c              |  2 +-
 3 files changed, 28 insertions(+), 16 deletions(-)
 rename INSTALL => INSTALL.md (100%)

diff --git a/INSTALL b/INSTALL.md
similarity index 100%
rename from INSTALL
rename to INSTALL.md
diff --git a/Makefile b/Makefile
index 14b0f34..4d653d1 100644
--- a/Makefile
+++ b/Makefile
@@ -3,35 +3,47 @@
 # export CROSS_COMPILE=arm-none-linux-gnueabi-
 # make
 
+EXENAME = mcrcon
+PREFIX ?= /usr/local
+
+CFLAGS = -std=gnu99 -Wall -Wextra -Wpedantic -Os -s
+EXTRAFLAGS = -fstack-protector-strong
+
+CC = gcc
+INSTALL = install
+LINKER =
+RM = rm -f
+
 ifeq ($(OS), Windows_NT)
 	LINKER = -lws2_32
 	EXENAME = mcrcon.exe
 	RM = cmd /C del /F
-else
-	LINKER =
-	EXENAME = mcrcon
-	RM = rm -f
 endif
 
-CC = gcc
-CFLAGS = -std=gnu99 -Wall -Wextra -Wpedantic -Os -s
-EXTRAFLAGS = -fstack-protector-strong
+ifeq ($(shell uname), Darwin)
+	INSTALL = ginstall
+	CFLAGS = -std=gnu99 -Wall -Wextra -Wpedantic -Os
+endif
 
-all:
-	$(CROSS_COMPILE)$(CC) $(CFLAGS) $(EXTRAFLAGS) -o $(EXENAME) mcrcon.c $(LINKER)
+.PHONY: all
+all: $(EXENAME)
+
+$(EXENAME): mcrcon.c
+	$(CROSS_COMPILE)$(CC) $(CFLAGS) $(EXTRAFLAGS) -o $@ $< $(LINKER)
 
 ifneq ($(OS), Windows_NT)
+.PHONY: install
 install:
-	cp $(EXENAME) /usr/local/bin/$(EXENAME)
-	chmod 0755 /usr/local/bin/$(EXENAME)
-	cp mcrcon.1 /usr/local/share/man/man1/mcrcon.1
-	chmod 0644 /usr/local/share/man/man1/mcrcon.1
+	$(INSTALL) -vD $(EXENAME) $(PREFIX)/bin/$(EXENAME)
+	$(INSTALL) -vD -m 0644 mcrcon.1 $(PREFIX)/share/man/man1/mcrcon.1
 	@echo "\nmcrcon installed. Run 'make uninstall' if you want to uninstall.\n"
+
+.PHONY: uninstall
 uninstall:
-	rm -f /usr/local/bin/$(EXENAME)
-	rm -f /usr/local/share/man/man1/mcrcon.1
+	rm -f $(PREFIX)/bin/$(EXENAME) $(PREFIX)/share/man/man1/mcrcon.1
 	@echo "\nmcrcon uninstalled.\n"
 endif
 
+.PHONY: clean
 clean:
 	$(RM) $(EXENAME)
diff --git a/mcrcon.c b/mcrcon.c
index aa8bae0..378c12b 100644
--- a/mcrcon.c
+++ b/mcrcon.c
@@ -304,7 +304,7 @@ int net_connect(const char *host, const char *port)
 {
 	int sd;
 
-	struct addrinfo hints = {0};
+	struct addrinfo hints = {.ai_family = 0};
 	struct addrinfo *server_info, *p;
 
 	hints.ai_family = AF_UNSPEC;