Skip to content
Snippets Groups Projects
Commit 8af8d3fe authored by Guilherme Salazar's avatar Guilherme Salazar
Browse files

use MAKE builtin variable in Makefile and leverage truthy value in gdk.rb

parent 6614e517
No related branches found
No related tags found
1 merge request!197bsd-compatible makefile
Loading
Loading
@@ -181,7 +181,7 @@ gitlab-workhorse/.git/pull:
influxdb-setup: influxdb/influxdb.conf influxdb/bin/influxd influxdb/meta/meta.db
 
influxdb/bin/influxd:
cd influxdb && make
cd influxdb && $(MAKE)
 
influxdb/meta/meta.db: Procfile
grep '^influxdb:' Procfile || (printf ',s/^#influxdb/influxdb/\nwq\n' | ed -s Procfile)
Loading
Loading
@@ -193,7 +193,7 @@ influxdb/influxdb.conf:
grafana-setup: grafana/grafana.ini grafana/bin/grafana-server grafana/gdk-pg-created grafana/gdk-data-source-created
 
grafana/bin/grafana-server:
cd grafana && make
cd grafana && $(MAKE)
 
grafana/grafana.ini:
sed -e "s|/home/git|${gitlab_development_root}|g" \
Loading
Loading
Loading
Loading
@@ -5,8 +5,7 @@
 
module GDK
PROGNAME = 'gdk'
MAKE = (RUBY_PLATFORM =~ /bsd/) != nil ? 'gmake' : 'make'
MAKE = RUBY_PLATFORM =~ /bsd/ ? 'gmake' : 'make'
 
# This function is called from bin/gdk. It must return true/false or
# an exit code.
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment