From a44d24ce40f5e11574f0265e4dc83ea4497ced28 Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Sat, 10 Oct 2015 12:42:10 +0200 Subject: [PATCH 1/2] build: Drop a trailing space --- src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile index ea20ba0b..bba75657 100644 --- a/src/Makefile +++ b/src/Makefile @@ -226,7 +226,7 @@ OBJS = \ ifndef KVZ_DISABLE_ASM # Compile C files in x86_asm folder with KVZ_COMPILE_ASM, which will cause - # the registration function to register the function pointers in the ASM + # the registration function to register the function pointers in the ASM # files. strategies/x86_asm/%.o: EXTRA_FLAGS += -DKVZ_COMPILE_ASM From 15fd8241a9c3fd035be05db1168fad82098e74cd Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Sat, 10 Oct 2015 12:42:24 +0200 Subject: [PATCH 2/2] build: Replace a sed expression with a simpler awk The former does not work for sure on macosx. --- src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile index bba75657..65ddfa31 100644 --- a/src/Makefile +++ b/src/Makefile @@ -330,7 +330,7 @@ endif .PHONY: kvazaar.pc init_submodules install install-pc install-prog install-lib .PHONY: install-dylib install-dll clean -kvazaar.pc: KVZ_VERSION = $(shell sed -n 's/^#define\s\+KVZ_VERSION\s\+\(.*\)/\1/ p' global.h) +kvazaar.pc: KVZ_VERSION = $(shell awk '/#define KVZ_VERSION/ { print $$3 }' global.h) kvazaar.pc: kvazaar.pc.in Makefile sed -e "s;@prefix@;$(PREFIX);" -e "s;@libdir@;$(LIBDIR);" \ -e "s;@VERSION@;$(KVZ_VERSION);" \