--- a/rel/vars.config	2011-11-17 21:17:47.000000000 +0100
+++ b/rel/vars.config	2012-01-06 12:59:28.321049744 +0100
@@ -1,12 +1,12 @@
 %% -*- tab-width: 4;erlang-indent-level: 4;indent-tabs-mode: nil -*-
 %% ex: ts=4 sw=4 et
 
-%% Platform-specific installation paths
-{platform_bin_dir,  "./bin"}.
-{platform_data_dir, "./data"}.
-{platform_etc_dir,  "./etc"}.
-{platform_lib_dir,  "./lib"}.
-{platform_log_dir,  "./log"}.
+% Platform-specific installation paths
+{platform_bin_dir,  "/usr/sbin"}.
+{platform_data_dir, "/var/lib/riak"}.
+{platform_etc_dir,  "/etc/riak"}.
+{platform_lib_dir,  "/usr/lib/riak"}.
+{platform_log_dir,  "/var/log/riak"}.
 
 %%
 %% etc/app.config
@@ -43,9 +43,9 @@
 %%
 %% bin/riak
 %%
-{runner_script_dir,  "$(cd ${0%/*} && pwd)"}.
-{runner_base_dir,    "${RUNNER_SCRIPT_DIR%/*}"}.
-{runner_etc_dir,     "$RUNNER_BASE_DIR/etc"}.
-{runner_log_dir,     "$RUNNER_BASE_DIR/log"}.
-{pipe_dir,           "/tmp/$RUNNER_BASE_DIR/"}.
-{runner_user,        ""}.
+{runner_script_dir,  "/usr/sbin"}.
+{runner_base_dir,    "{{platform_lib_dir}}"}.
+{runner_etc_dir,     "{{platform_etc_dir}}"}.
+{runner_log_dir,     "{{platform_log_dir}}"}.
+{pipe_dir,           "/tmp/riak/"}.
+{runner_user,        "riak"}.