From: Eric S. Raymond Date: Wed, 31 May 2017 18:53:01 +0000 (-0400) Subject: Simplify inclusion computation so it's BSD-friendly. X-Git-Tag: 0.90~44 X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=commitdiff_plain;h=2e5c6cf810e73efa9993f6246081c48e32ee41b0;hp=b2c0107fed4a5ab70d1f8d44dd61c0450cbbbce6 Simplify inclusion computation so it's BSD-friendly. --- diff --git a/Makefile b/Makefile index 35b097b..9fa8a67 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,11 @@ # Makefile for the open-source release of adventure 2.5 +CC?=gcc CCFLAGS=-std=c99 -LIBS=-lrt +LIBS= UNAME_S := $(shell uname -s) -GCCVERSIONGTEQ4 := $(shell expr `gcc -dumpversion | cut -f1 -d.` \>= 4) -ifeq ($(UNAME_S),Darwin) - LIBS= -else ifeq "$(GCCVERSIONGTEQ4)" "1" - CC=c99 +ifeq ($(UNAME_S),Linux) + LIBS=-lrt endif OBJS=main.o init.o actions1.o actions2.o score.o misc.o database.o