projects
/
rails.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
06915a7
)
Alter the Makefile to be robust against bundler warnings
author
Andy Allan
<git@gravitystorm.co.uk>
Wed, 29 Aug 2018 04:36:31 +0000
(12:36 +0800)
committer
Andy Allan
<git@gravitystorm.co.uk>
Wed, 29 Aug 2018 04:36:31 +0000
(12:36 +0800)
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
patch
|
blob
|
history
diff --git
a/db/functions/Makefile
b/db/functions/Makefile
index 6bb966b9a5d95933e17c919696c7918f02ac23f9..6a3fbc0b997f5d8ad2d3dd32f5e25b34612c6f62 100644
(file)
--- 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)