From: David Carlier Date: Mon, 4 Dec 2017 16:17:09 +0000 (+0000) Subject: GNU sed by default but can be overwritten X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2Fgnu_sed_build_fix;p=xonotic%2Fxonotic.git GNU sed by default but can be overwritten --- diff --git a/CMakeLists.txt b/CMakeLists.txt index e63f71f6..3d2a0fbb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,6 +3,7 @@ project(xonotic) option(DOWNLOAD_MAPS "Download new maps from the build server" ON) option(BUILD_RELEASE "Package a release" OFF) +set(SED "gsed" CACHE STRING "") function(subproject id name) if ($ENV{XON_NO_${id}}) diff --git a/Makefile b/Makefile index 72c16677..914fb4fc 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,7 @@ INSTALL ?= install ARCH ?= $(shell if [ x"`uname -m`" = x"x86_64" ]; then echo linux64; else echo linux32; fi) LN ?= ln CP ?= cp +SED ?= sed BINARY ?= yes SUFFIX ?= $(shell if [ -d .git ]; then echo git; elif [ x"$(BINARY)" = x"yes" ]; then echo zip-binary; else echo zip-source; fi) RIJNDAELDETECT_CONFIGURE ?= $(shell if ! [ -f source/d0_blind_id/d0_rijndael.c ]; then echo --disable-rijndael; fi)