From 0dee34480f0a0c08d628bfe9b71636ecd0939951 Mon Sep 17 00:00:00 2001 From: Andrew Pamment Date: Sun, 19 Mar 2017 08:13:25 +1000 Subject: [PATCH] Another try at freebsd makefiles --- utils/magimail/src/Makefile.linux | 4 +++- utils/magimail/src/cmnllib/Makefile.linux | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/utils/magimail/src/Makefile.linux b/utils/magimail/src/Makefile.linux index ae9da01..a529653 100644 --- a/utils/magimail/src/Makefile.linux +++ b/utils/magimail/src/Makefile.linux @@ -5,6 +5,8 @@ PLATFORMDEF = -DPLATFORM_LINUX EXESUFFIX = +OS = `uname -s` + BINDIR = ../bin OBJDIR = obj INCDIR = ./ @@ -38,7 +40,7 @@ MBOBJS = $(MBOBJS_MSG) $(MBOBJS_JAM) $(MBOBJS_SQ3) DEFS = $(PLATFORMDEF) $(MBDEFS) $(NLDEFS) # Commands -ifeq (`uname -s`, FreeBSD) +ifeq ($(OS), FreeBSD) CC = cc $(CPPFLAGS) $(CFLAGS) $(DEFS) $(LDFLAGS) -I $(INCDIR) -I ../../../deps/ -Wall else CC = gcc $(CPPFLAGS) $(CFLAGS) $(DEFS) $(LDFLAGS) -I $(INCDIR) -I ../../../deps/ -Wall diff --git a/utils/magimail/src/cmnllib/Makefile.linux b/utils/magimail/src/cmnllib/Makefile.linux index 7771183..b3c823e 100644 --- a/utils/magimail/src/cmnllib/Makefile.linux +++ b/utils/magimail/src/cmnllib/Makefile.linux @@ -1,6 +1,9 @@ INCDIR = ../ -ifeq (`uname -s`, FreeBSD) + +OS = `uname -s` + +ifeq ($(OS), FreeBSD) CC = cc $(CPPFLAGS) $(CFLAGS) -DPLATFORM_LINUX $(LDFLAGS) -I $(INCDIR) -Wall else CC = gcc $(CPPFLAGS) $(CFLAGS) -DPLATFORM_LINUX $(LDFLAGS) -I $(INCDIR) -Wall