From 8db7f5aeac94e01b9f104b985e175d2438d47000 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 29 Aug 2018 12:36:31 +0800 Subject: [PATCH 1/1] Alter the Makefile to be robust against bundler warnings In bundle < 2.0, warnings are printed to stdout, along with the path information that we need. This takes the final line of the output and assumes it's the path. Fixes #1930 --- db/functions/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/functions/Makefile b/db/functions/Makefile index 6bb966b9a..6a3fbc0b9 100644 --- a/db/functions/Makefile +++ b/db/functions/Makefile @@ -1,7 +1,7 @@ PG_CONFIG ?= pg_config DESTDIR ?= . -QTDIR=$(shell bundle show quad_tile)/ext/quad_tile +QTDIR=$(shell bundle show quad_tile | tail -n 1)/ext/quad_tile OS=$(shell uname -s) ifeq (${OS},Darwin) -- 2.43.2