Skip to content
Snippets Groups Projects
Commit 980172b5 authored by Jacob Vosmaer (GitLab)'s avatar Jacob Vosmaer (GitLab)
Browse files

Merge branch 'makefile-freebsd' into 'master'

RFC: bsd-compatible makefile

The "shell" function -- $(shell cmd), to execute cmd in the shell -- is a GNU extensions. There are two options: one of them is to use the grave accent, as in this proposed change; the other is to use the shell assignment operator "!=", originally found in BSDs and implemented by GNU make later.

See merge request !197
parents a6ecfa59 316c6fd4
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,6 +5,7 @@
 
module GDK
PROGNAME = 'gdk'
MAKE = RUBY_PLATFORM =~ /bsd/ ? 'gmake' : 'make'
 
# This function is called from bin/gdk. It must return true/false or
# an exit code.
Loading
Loading
@@ -13,11 +14,11 @@ module GDK
when 'run'
exec('./run', *ARGV, chdir: $gdk_root)
when 'install'
exec('make', *ARGV, chdir: $gdk_root)
exec(MAKE, *ARGV, chdir: $gdk_root)
when 'update'
exec('make', 'update', chdir: $gdk_root)
exec(MAKE, 'update', chdir: $gdk_root)
when 'reconfigure'
exec('make', 'clean-config', 'all', chdir: $gdk_root)
exec(MAKE, 'clean-config', 'all', chdir: $gdk_root)
when 'help'
puts File.read(File.join($gdk_root, 'HELP'))
true
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