From 01822c6855ed63d7f5eea2635d7418e35d44e513 Mon Sep 17 00:00:00 2001 From: Andrew Pamment Date: Sun, 19 Mar 2017 08:21:30 +1000 Subject: [PATCH] FreeBSD makefiles again --- utils/magimail/src/Makefile.linux | 2 +- utils/magimail/src/cmnllib/Makefile.linux | 2 +- utils/magimail/src/oslib_linux/Makefile | 8 +++++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/utils/magimail/src/Makefile.linux b/utils/magimail/src/Makefile.linux index a529653..ee4e5a5 100644 --- a/utils/magimail/src/Makefile.linux +++ b/utils/magimail/src/Makefile.linux @@ -5,7 +5,7 @@ PLATFORMDEF = -DPLATFORM_LINUX EXESUFFIX = -OS = `uname -s` +OS := $(shell uname -s) BINDIR = ../bin OBJDIR = obj diff --git a/utils/magimail/src/cmnllib/Makefile.linux b/utils/magimail/src/cmnllib/Makefile.linux index b3c823e..048ef41 100644 --- a/utils/magimail/src/cmnllib/Makefile.linux +++ b/utils/magimail/src/cmnllib/Makefile.linux @@ -1,7 +1,7 @@ INCDIR = ../ -OS = `uname -s` +OS := $(shell uname -s) ifeq ($(OS), FreeBSD) CC = cc $(CPPFLAGS) $(CFLAGS) -DPLATFORM_LINUX $(LDFLAGS) -I $(INCDIR) -Wall diff --git a/utils/magimail/src/oslib_linux/Makefile b/utils/magimail/src/oslib_linux/Makefile index 5ee9b75..b8719f9 100644 --- a/utils/magimail/src/oslib_linux/Makefile +++ b/utils/magimail/src/oslib_linux/Makefile @@ -1,6 +1,12 @@ INCDIR = ../ -CC = gcc $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -Wall -I $(INCDIR) -DPLATFORM_LINUX -g +OS := $(shell uname -s) + +ifeq ($(OS), FreeBSD) + CC = gcc $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -Wall -I $(INCDIR) -DPLATFORM_LINUX -g +else + CC = cc $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -Wall -I $(INCDIR) -DPLATFORM_LINUX -g +endif AR = ar -ru RM = rm -f