4 files changed, 18 insertions, 20 deletions
diff --git a/lib/tools/src/Makefile b/lib/tools/src/Makefile
index 360f4f8f29..abe1389771 100644
--- a/lib/tools/src/Makefile
+++ b/lib/tools/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1996-2010. All Rights Reserved.
+# Copyright Ericsson AB 1996-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -105,10 +105,10 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(HRL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(HRL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \
-		$(RELSYSDIR)/ebin
+		"$(RELSYSDIR)/ebin"
 
 release_docs_spec:
diff --git a/lib/tools/src/fprof.erl b/lib/tools/src/fprof.erl
index 8165a6c13a..4cbb910f11 100644
--- a/lib/tools/src/fprof.erl
+++ b/lib/tools/src/fprof.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -89,9 +89,7 @@ dbg(_, _, _) ->
 
 apply({M, F}, Args) 
   when is_atom(M), is_atom(F), is_list(Args) ->
-    Arity = length(Args),
-    Function = fun M:F/Arity,
-    apply_1(Function, Args, []);
+    apply_1(M, F, Args, []);
 apply(Fun, Args) 
   when is_function(Fun), is_list(Args) ->
     apply_1(Fun, Args, []);
@@ -99,26 +97,25 @@ apply(A, B) ->
     erlang:error(badarg, [A, B]).
 
 apply(M, F, Args) when is_atom(M), is_atom(F), is_list(Args) ->
-    apply_1({M, F}, Args, []);
+    apply_1(M, F, Args, []);
 apply({M, F}, Args, Options) 
   when is_atom(M), is_atom(F), is_list(Args), is_list(Options) ->
-    Arity = length(Args),
-    Function = fun M:F/Arity,
-    apply_1(Function, Args, Options);
+    apply_1(M, F, Args, Options);
 apply(Fun, Args, Options) 
   when is_function(Fun), is_list(Args), is_list(Options) ->
     apply_1(Fun, Args, Options);
 apply(A, B, C) ->
     erlang:error(badarg, [A, B, C]).
 
-apply(Module, Function, Args, Options) 
-  when is_atom(Module), is_atom(Function), is_list(Args), is_list(Options) ->
-    Arity = length(Args),
-    Fun = fun Module:Function/Arity,
-    apply_1(Fun, Args, Options);
+apply(M, F, Args, Options)
+  when is_atom(M), is_atom(F), is_list(Args), is_list(Options) ->
+    apply_1(M, F, Args, Options);
 apply(A, B, C, D) ->
     erlang:error(badarg, [A, B, C, D]).
 
+apply_1(M, F, Args, Options) ->
+    Arity = length(Args),
+    apply_1(fun M:F/Arity, Args, Options).
 
 apply_1(Function, Args, Options) ->        
     {[_, Procs, Continue], Options_1} =
diff --git a/lib/tools/src/tools.app.src b/lib/tools/src/tools.app.src
index cd9b622f15..94998fb763 100644
--- a/lib/tools/src/tools.app.src
+++ b/lib/tools/src/tools.app.src
@@ -24,6 +24,7 @@
 	     eprof,
 	     fprof,
 	     instrument,
+	     lcnt,
 	     make,
 	     xref,
 	     xref_base,
diff --git a/lib/tools/src/xref_utils.erl b/lib/tools/src/xref_utils.erl
index 9d4a175d88..680563e9df 100644
--- a/lib/tools/src/xref_utils.erl
+++ b/lib/tools/src/xref_utils.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2000-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -141,7 +141,7 @@ is_string([], _) ->
 is_string(Term, C) ->
     is_string1(Term, C).
 
-is_string1([H | T], C) when H > C, H < 127 -> 
+is_string1([H | T], C) when H > C ->
     is_string1(T, C);
 is_string1([], _) -> 
     true;