From deed43ad613d3b65a0ba45d2add610775e498151 Mon Sep 17 00:00:00 2001 From: Tiiffi Date: Thu, 7 Nov 2024 17:14:25 +0200 Subject: [PATCH] Makefile macOS fix, resolves #82, resolves #102 - Remove "ginstall" as "install" replacement on macOS - Remove "-D" flag from "install" parameters --- INSTALL.md | 2 +- Makefile | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index cc7b916..96ae781 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,5 +1,5 @@ Building and installing ------------------------- +----------------------- Only dependency is C library and POSIX getopt support. diff --git a/Makefile b/Makefile index 25b5127..c49c3f1 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ # make # # Windows cross compile: -# i686-w64-mingw32-gcc -std=gnu99 -Wall -Wextra -Wpedantic -O2 -o mcrcon.exe mcrcon.c -lws2_32 +# x86_64-w64-mingw32-gcc -std=gnu99 -Wall -Wextra -Wpedantic -O2 -fstack-protector-all -o mcrcon.exe mcrcon.c -lws2_32 EXENAME = mcrcon PREFIX ?= /usr/local @@ -23,11 +23,6 @@ ifeq ($(OS), Windows_NT) RM = cmd /C del /F endif -ifeq ($(shell uname), Darwin) - INSTALL = ginstall - CFLAGS = -std=gnu99 -Wall -Wextra -Wpedantic -O2 -endif - .PHONY: all all: $(EXENAME) @@ -37,8 +32,8 @@ $(EXENAME): mcrcon.c ifneq ($(OS), Windows_NT) .PHONY: install install: - $(INSTALL) -vD $(EXENAME) $(DESTDIR)$(PREFIX)/bin/$(EXENAME) - $(INSTALL) -vD -m 0644 mcrcon.1 $(DESTDIR)$(PREFIX)/share/man/man1/mcrcon.1 + $(INSTALL) -v $(EXENAME) $(DESTDIR)$(PREFIX)/bin/$(EXENAME) + $(INSTALL) -v -m 0644 mcrcon.1 $(DESTDIR)$(PREFIX)/share/man/man1/mcrcon.1 @echo "\nmcrcon installed. Run 'make uninstall' if you want to uninstall.\n" .PHONY: uninstall