Improved NIF initialization.

davisp · Jun 13, 2011 · f94c7af · f94c7af
1 parent 5846159
commit f94c7af
Showing 1 changed file with 8 additions and 11 deletions.
diff --git a/src/jiffy.erl b/src/jiffy.erl
@@ -79,18 +79,15 @@ finish_encode(_, _) ->
 
 
 init() ->
-    SoName = case code:priv_dir(?MODULE) of
-        {error, bad_name} ->
-            case filelib:is_dir(filename:join(["..", priv])) of
-                true ->
-                    filename:join(["..", priv, ?MODULE]);
-                _ ->
-                    filename:join([priv, ?MODULE])
-            end;
-        Dir ->
-            filename:join(Dir, ?MODULE)
+    PrivDir = case code:priv_dir(?MODULE) of
+        {error, _} ->
+            EbinDir = filename:dirname(code:which(?MODULE)),
+            AppPath = filename:dirname(EbinDir),
+            filename:join(AppPath, "priv");
+        Path ->
+            Path
     end,
-    erlang:load_nif(SoName, 0).
+    erlang:load_nif(filename:join(PrivDir, "jiffy"), 0).
 
 
 not_loaded(Line) ->