From e5c2022f7151ba7b4af8724fa64d8a061ce06c6a Mon Sep 17 00:00:00 2001 From: Kill Your TV Date: Thu, 18 Dec 2014 10:11:18 +0000 Subject: [PATCH] Fix building in kFreeBSD broken in 8c218bd5 --- Makefile | 3 ++- Makefile.linux | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7ba467cc..9fdfa4b4 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ UNAME := $(shell uname -s) SHLIB := libi2pd.so I2PD := i2p +GREP := fgrep include filelist.mk @@ -10,7 +11,7 @@ USE_STATIC := no ifeq ($(UNAME),Darwin) DAEMON_SRC += DaemonLinux.cpp include Makefile.osx -else ifeq ($(UNAME),FreeBSD) +else ifeq ($(shell echo $(UNAME) | $(GREP) -c FreeBSD),1) DAEMON_SRC += DaemonLinux.cpp include Makefile.bsd else ifeq ($(UNAME),Linux) diff --git a/Makefile.linux b/Makefile.linux index 04712322..d554cd18 100644 --- a/Makefile.linux +++ b/Makefile.linux @@ -36,7 +36,6 @@ else LDLIBS = -lcryptopp -lboost_system -lboost_date_time -lboost_filesystem -lboost_regex -lboost_program_options -lpthread endif -GREP = fgrep IS_64 := $(shell $(CXX) -dumpmachine 2>&1 | $(GREP) -c "64") ifeq ($(USE_AESNI),yes) ifeq ($(IS_64),1)