From 8e91e1014e665e74138228cf6c8361c196c26268 Mon Sep 17 00:00:00 2001
From: Jon Meredith <jon.hg@jonmeredith.com>
Date: Mon, 30 Nov 2009 12:02:09 -0700
Subject: Connected up symlinking the list of progs in rebar.config/app_bin to
 the OTP bin dir.

---
 src/rebar_file_utils.erl | 3 ++-
 src/rebar_otp_app.erl    | 7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/rebar_file_utils.erl b/src/rebar_file_utils.erl
index af47ea8..60b6a59 100644
--- a/src/rebar_file_utils.erl
+++ b/src/rebar_file_utils.erl
@@ -26,7 +26,8 @@
 
 -export([rm_rf/1,
          mkdir_p/1,
-         cp_r/2]).
+         cp_r/2,
+         ln_sf/2]).
 
 -include("rebar.hrl").
 
diff --git a/src/rebar_otp_app.erl b/src/rebar_otp_app.erl
index b6c8ea4..8b72baa 100644
--- a/src/rebar_otp_app.erl
+++ b/src/rebar_otp_app.erl
@@ -84,7 +84,10 @@ install(Config, File) ->
         [] ->
             ok;
         List ->
-            ok 
+            %% code:root_dir() gives $OTPROOT/lib/erlang on a stock install
+            %% so find the bin dir relative to that.
+            BinDir = filename:join([code:root_dir(), "..", "..", "bin"]),
+            install_binaries(List, AppDir, BinDir)
     end.
     
 
@@ -95,7 +98,7 @@ install(Config, File) ->
 install_binaries([], _AppDir, _BinDir) ->
     ok;
 install_binaries([Bin | Rest], AppDir, BinDir) ->
-    FqBin = filename:join([Bin, AppDir]),
+    FqBin = filename:join([AppDir, Bin]),
     rebar_file_utils:ln_sf(FqBin, BinDir),
     install_binaries(Rest, AppDir, BinDir).
  
-- 
cgit v1.1