LogoopenSUSE Build Service > Projects
Sign Up | Log In

View File otp-R15B03-1-lib-wx.patch of Package erlang (Project home:Ledest:erlang:R15)

 lib/wx/c_src/Makefile.in |  6 +++---
 lib/wx/src/wx.erl        | 17 -----------------
 lib/wx/src/wxe_util.erl  |  2 +-
 3 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/lib/wx/c_src/Makefile.in b/lib/wx/c_src/Makefile.in
index 1497ac4..461b09b 100644
--- a/lib/wx/c_src/Makefile.in
+++ b/lib/wx/c_src/Makefile.in
@@ -176,10 +176,10 @@ $(TARGET_DIR)/erl_gl$(SO_EXT): $(GL_OBJECTS)
 # ----------------------------------------------------
 include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
-	$(INSTALL_DIR) "$(RELSYSDIR)/priv"
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
 	$(INSTALL_DATA) ../priv/erlang-logo32.png "$(RELSYSDIR)/priv/"
 	$(INSTALL_DATA) ../priv/erlang-logo64.png "$(RELSYSDIR)/priv/"
-	$(INSTALL_PROGRAM) $(TARGET_DIR)/wxe_driver$(SO_EXT) "$(RELSYSDIR)/priv/"
-	$(INSTALL_PROGRAM) $(TARGET_DIR)/erl_gl$(SO_EXT) "$(RELSYSDIR)/priv/"
+	$(INSTALL_PROGRAM) $(TARGET_DIR)/wxe_driver$(SO_EXT) "$(RELSYSDIR)/priv/lib/"
+	$(INSTALL_PROGRAM) $(TARGET_DIR)/erl_gl$(SO_EXT) "$(RELSYSDIR)/priv/lib/"
 
 release_docs_spec:
diff --git a/lib/wx/src/wx.erl b/lib/wx/src/wx.erl
index 7d62305..25e457d 100644
--- a/lib/wx/src/wx.erl
+++ b/lib/wx/src/wx.erl
@@ -70,8 +70,6 @@
 -export([create_memory/1, get_memory_bin/1,
 	 retain_memory/1, release_memory/1]).
 
--export([demo/0]).
-
 -export_type([wx_object/0, wx_env/0, wx_memory/0]).
 -export_type([wx_colour/0, wx_colour4/0, wx_datetime/0,
 	      wx_enum/0, wx_wxMouseState/0, wx_wxHtmlLinkInfo/0]).
@@ -313,18 +311,3 @@ debug(Level) when is_integer(Level) ->
 	    wxe_server:set_debug(Server,Level),
 	    ok
     end.
-
-%% @doc Starts a wxErlang demo if examples directory exists and is compiled
--spec demo() -> ok | {error, atom()}.
-demo() ->
-    Priv = code:priv_dir(wx),
-    Demo = filename:join([filename:dirname(Priv),examples,demo]),
-    Mod  = list_to_atom("demo"), %% Fool xref tests
-    case file:set_cwd(Demo) of
-	ok ->
-	    apply(Mod, start, []),
-	    ok;
-	_  ->
-	    {error, no_demo_dir}
-    end.
-
diff --git a/lib/wx/src/wxe_util.erl b/lib/wx/src/wxe_util.erl
index 02bca62..708f921 100644
--- a/lib/wx/src/wxe_util.erl
+++ b/lib/wx/src/wxe_util.erl
@@ -219,7 +219,7 @@ priv_dir(Driver0) ->
     Priv = case filelib:is_regular(Path) of
 	       true ->
 		   Beam = filename:join(["ebin/",atom_to_list(?MODULE) ++ ".beam"]),
-		   filename:join(strip(Path, Beam), "priv");
+		   filename:join(strip(Path, Beam), "priv/lib");
 	       false ->
 		   code:priv_dir(wx)
 	   end,