From: Michael Stapelberg Date: Sun, 23 Oct 2011 10:31:55 +0000 (+0100) Subject: makefile: use /bin/echo to get consistent results for the escaping X-Git-Tag: 4.1~86 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6927e899e69cb21ccbdadefcf9f03f8251d50c86;p=i3%2Fi3 makefile: use /bin/echo to get consistent results for the escaping On the buildbot slave machine, we have a different version of zsh which seems to handle this slightly different with the built-in echo… --- diff --git a/Makefile b/Makefile index b2a39952..5e82ebc3 100644 --- a/Makefile +++ b/Makefile @@ -112,7 +112,7 @@ dist: distclean # Only copy source code from i3-input mkdir i3-${VERSION}/i3-input find i3-input -maxdepth 1 -type f \( -name "*.c" -or -name "*.h" -or -name "Makefile" \) -exec cp '{}' i3-${VERSION}/i3-input \; - sed -e 's/^GIT_VERSION:=\(.*\)/GIT_VERSION:=$(shell echo '${GIT_VERSION}' | sed 's/\\/\\\\/g')/g;s/^VERSION:=\(.*\)/VERSION:=${VERSION}/g' common.mk > i3-${VERSION}/common.mk + sed -e 's/^GIT_VERSION:=\(.*\)/GIT_VERSION:=$(shell /bin/echo '${GIT_VERSION}' | sed 's/\\/\\\\/g')/g;s/^VERSION:=\(.*\)/VERSION:=${VERSION}/g' common.mk > i3-${VERSION}/common.mk # Pre-generate a manpage to allow distributors to skip this step and save some dependencies $(MAKE) -C man cp man/*.1 i3-${VERSION}/man/