diff options
author | Andreas Maunz <andreas@maunz.de> | 2012-02-09 15:47:19 +0100 |
---|---|---|
committer | Andreas Maunz <andreas@maunz.de> | 2012-02-09 15:47:19 +0100 |
commit | d6d9bab4f77dc4e65f8120f2602d38178721a80e (patch) | |
tree | d1925cd14960d410353a567a1b331689abd4a428 /config.sh | |
parent | 33babc8050bf00dba4929cb35d65bef926c9b7b4 (diff) | |
parent | ca56463e893e0d058dc5571e673d2fbfe14508b2 (diff) |
Merge branch 'pc_new_1' into development
Conflicts:
config.sh
Diffstat (limited to 'config.sh')
-rwxr-xr-x | config.sh | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -34,17 +34,16 @@ RUBY_CONF="$OT_PREFIX/.sh_ruby_ot" REDIS_CONF="$OT_PREFIX/.sh_redis_ot" NGINX_CONF="$OT_PREFIX/.sh_nginx_ot" OB_CONF="$OT_PREFIX/.sh_OB_ot" -KL_CONF="$OT_PREFIX/.sh_R_ot" +R_CONF="$OT_PREFIX/.sh_R_ot" RUBY_VER="ruby-enterprise-$RUBY_NUM_VER" OB_VER="openbabel-$OB_NUM_VER" -KL_VER="$KL_NUM_VER" REDIS_VER="$REDIS_NUM_VER" RUBY_DEST="$OT_PREFIX/$RUBY_VER" OB_DEST="$OT_PREFIX/$OB_VER" OB_DEST_BINDINGS="$OT_PREFIX/openbabel-ruby-install" -KL_DEST="$OT_PREFIX/r-packages" +R_DEST="$OT_PREFIX/r-packages" NGINX_DEST="$OT_PREFIX/nginx" REDIS_DEST="$OT_PREFIX/redis-$REDIS_VER" |