aboutsummaryrefslogtreecommitdiffstats
path: root/lib/wx/c_src/Makefile.in
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2010-10-19 10:34:08 +0200
committerDan Gudmundsson <[email protected]>2010-11-15 10:13:07 +0100
commit029429cae951a9896d544eb7693fd130e4abc979 (patch)
tree4999245716dfbee0b648f27c2cfbf83cbc043967 /lib/wx/c_src/Makefile.in
parent8577598667bff43f503f3cae87934c3e9918d135 (diff)
downloadotp-029429cae951a9896d544eb7693fd130e4abc979.tar.gz
otp-029429cae951a9896d544eb7693fd130e4abc979.tar.bz2
otp-029429cae951a9896d544eb7693fd130e4abc979.zip
Remove ostype sub dirs below wx/priv
This was intended for distributing several binaries in one package, in standalone version, it has no need when included in otp.
Diffstat (limited to 'lib/wx/c_src/Makefile.in')
-rw-r--r--lib/wx/c_src/Makefile.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/wx/c_src/Makefile.in b/lib/wx/c_src/Makefile.in
index 4713b5ae69..69418f62ef 100644
--- a/lib/wx/c_src/Makefile.in
+++ b/lib/wx/c_src/Makefile.in
@@ -79,7 +79,7 @@ WX_OBJECTS = $(GENERAL_O) $(GENERATED_O) $(RC_FILE)
OBJECTS = $(WX_OBJECTS) $(GL_OBJECTS)
TARGET_APIS = wxe_driver erl_gl
-TARGET_DIR = ../priv/$(SYS_TYPE)
+TARGET_DIR = ../priv
# -O2 -funroll-loops -ffast-math -fomit-frame-pointer
@@ -179,11 +179,11 @@ $(TARGET_DIR)/erl_gl$(SO_EXT): $(GL_OBJECTS)
ifeq ($(INSIDE_ERLSRC),true)
include $(ERL_TOP)/make/otp_release_targets.mk
release_spec: opt
- $(INSTALL_DIR) $(RELSYSDIR)/priv/$(SYS_TYPE)
+ $(INSTALL_DIR) $(RELSYSDIR)/priv
$(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/$(SYS_TYPE)
- $(INSTALL_PROGRAM) $(TARGET_DIR)/erl_gl$(SO_EXT) $(RELSYSDIR)/priv/$(SYS_TYPE)
+ $(INSTALL_PROGRAM) $(TARGET_DIR)/wxe_driver$(SO_EXT) $(RELSYSDIR)/priv/
+ $(INSTALL_PROGRAM) $(TARGET_DIR)/erl_gl$(SO_EXT) $(RELSYSDIR)/priv/
release_docs_spec: