From 89cda8a5fd7ea80b04eec37e7c7e352c4f9b8307 Mon Sep 17 00:00:00 2001 From: Martin Stjernholm <mast@lysator.liu.se> Date: Tue, 12 Oct 2010 11:13:20 +0200 Subject: [PATCH] Another go at fixing the $(OS) expansion. Avoid "... ${FOO:-`...`} ..." since there apparently are sh compat issues whether or not " must be escaped inside the ${...}. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3f6e8a93e7..4908319070 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ # Tip: Remove "-r" from the line below if you don't want to rebuild # from scratch every time you upgrade the kernel. -OS=$${PIKE_BUILD_OS:-`uname -s -r -m|sed "s/ /-/g"|tr "[A-Z]" "[a-z]"|tr "/()" "___"`} +OS=`if [ -n \"$$PIKE_BUILD_OS\" ]; then echo \"$$PIKE_BUILD_OS\"; else uname -s -r -m|sed \"s/ /-/g\"|tr \"[A-Z]\" \"[a-z]\"|tr \"/()\" \"___\"; fi` VPATH=. BUILDDIR=build/$(OS) -- GitLab