diff options
| -rw-r--r-- | .rebar/templates/Makefile | 8 | ||||
| -rw-r--r-- | .rebar/templates/make.template | 5 | ||||
| -rw-r--r-- | .rebar/templates/production.template | 4 | ||||
| -rwxr-xr-x | configure | 2 |
4 files changed, 7 insertions, 12 deletions
diff --git a/.rebar/templates/Makefile b/.rebar/templates/Makefile index 62797111..49006738 100644 --- a/.rebar/templates/Makefile +++ b/.rebar/templates/Makefile @@ -30,7 +30,7 @@ distclean: clean install: dist @mkdir -p {{prefix}}/dbcore/ @cp -R rel/dbcore/* {{prefix}}/dbcore/ - @mkdir -p {{data}} - @chown {{user}} {{data}} - @mkdir -p {{view}} - @chown {{user}} {{view}} + @mkdir -p {{data_dir}} + @chown {{user}} {{data_dir}} + @mkdir -p {{view_dir}} + @chown {{user}} {{view_dir}} diff --git a/.rebar/templates/make.template b/.rebar/templates/make.template deleted file mode 100644 index 2c40ba37..00000000 --- a/.rebar/templates/make.template +++ /dev/null @@ -1,5 +0,0 @@ -{variables, [{prefix, "/opt"}, - {data, "/srv/db"}, - {view, "/srv/view_index"}, - {user, "dbcore"}]}. -{template, "./Makefile", "Makefile"}. diff --git a/.rebar/templates/production.template b/.rebar/templates/production.template index d4090266..7f5e6db8 100644 --- a/.rebar/templates/production.template +++ b/.rebar/templates/production.template @@ -1,7 +1,9 @@ {variables, [{prefix, "{{prefix}}"}, {core_dir, "{{prefix}}/dbcore"}, {data_dir, "/srv/db"}, - {view_dir, "/srv/view_index"}]}. + {view_dir, "/srv/view_index"}, + {user, "dbcore"}]}. +{template, "./Makefile", "Makefile"}. {template, "./etc/default.ini", "rel/overlay/etc/default.ini"}. {file, "rebar.config", "rebar.config"}. {file, "/usr/local/lib/erlang/lib/erl_interface-3.6.5/bin/erl_call", "rel/overlay/erts-vsn/bin/erl_call"}. @@ -45,7 +45,5 @@ done echo "configuring dbcore" rm -f rebar.config -# Makefile -./rebar create template=make prefix=$PREFIX data=$DATA view=$VIEW user=$DBCORE_USER force=1 # dbcore template ./rebar create template=$TEMPLATE prefix=$PREFIX force=1 |