nifs: change install dir to the "priv" folder, properly find its path

Makefile.in

@@ -126,7 +126,7 @@ SCALARIS_UNITTEST_YAWS_PORT ?= 8000
 SCALARIS_JTEST_NAME ?= jtest_boot
 
 NIFS_SRC_CPP=$(wildcard src/nifs/*.cpp)
-NIFS_SO=$(subst src/nifs,bin,$(NIFS_SRC_CPP:.cpp=.so))
+NIFS_SO=$(subst src/nifs,priv,$(NIFS_SRC_CPP:.cpp=.so))
 
 all: Makefile nifs compile tags
 #all: compile dialyzer java test docs
@@ -610,7 +610,7 @@ rrd-init:
 
 nifs: $(NIFS_SO)
 
-bin/%.so: src/nifs/%.cpp Makefile
+priv/%.so: src/nifs/%.cpp Makefile
 	@CXX@ @NIFFLAGS@ -I@ERLANG_ROOT_DIR@/erts-@ERLANG_LIB_VER_erts@/include @CXXFLAGS@ -fPIC -o $@ $<
 
 install-doc: doc

priv/.gitignore

@@ -0,0 +1 @@
+*.so

src/time/clocks.erl

@@ -34,7 +34,20 @@
 -spec init() -> ok.
 init() ->
     %% loads the shared library
-    SoName = filename:join(filename:join(code:lib_dir(scalaris), bin), ?MODULE),
+    SoName =
+        case code:priv_dir(scalaris) of
+            {error, bad_name} ->
+                case filelib:is_dir(filename:join(["..", priv])) of
+                    true ->
+                        filename:join(["..", priv, ?MODULE]);
+                    _ ->
+                        filename:join(
+                          [filename:dirname(code:where_is_file("scalaris.beam")),
+                           "..", priv, ?MODULE])
+                end;
+            Dir ->
+                filename:join(Dir, ?MODULE)
+        end,
     erlang:load_nif(SoName, 0).
 
 -spec get_monotonic_clock() -> failed | {non_neg_integer(), non_neg_integer()}.