Skip to content

Commit

Permalink
Merge branch 'pl/fix-shared-lib-install' into dev
Browse files Browse the repository at this point in the history
* pl/fix-shared-lib-install:
  Fix shared libraries installation
  • Loading branch information
Erlang/OTP committed May 11, 2010
2 parents 5a0f02c + 7809f92 commit d3a3a83
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion lib/asn1/c_src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk

release_spec: opt
$(INSTALL_DIR) $(RELSYSDIR)/priv/lib
$(INSTALL_DATA) $(SHARED_OBJ_FILES) $(RELSYSDIR)/priv/lib
$(INSTALL_PROGRAM) $(SHARED_OBJ_FILES) $(RELSYSDIR)/priv/lib
$(INSTALL_DIR) $(RELSYSDIR)/c_src
$(INSTALL_DATA) $(C_FILES) $(RELSYSDIR)/c_src

Expand Down
2 changes: 1 addition & 1 deletion lib/megaco/src/flex/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ release_spec: opt
$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true)
$(INSTALL_DATA) $(FLEX_FILES) $(C_TARGETS) $(RELSYSDIR)/src/flex
$(INSTALL_DATA) $(SOLIBS) $(RELSYSDIR)/priv/lib
$(INSTALL_PROGRAM) $(SOLIBS) $(RELSYSDIR)/priv/lib
endif


Expand Down
2 changes: 1 addition & 1 deletion lib/wx/c_src/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ release_spec: opt
$(INSTALL_DIR) $(RELSYSDIR)/priv/$(SYS_TYPE)
$(INSTALL_DATA) ../priv/erlang-logo32.png $(RELSYSDIR)/priv/
$(INSTALL_DATA) ../priv/erlang-logo64.png $(RELSYSDIR)/priv/
$(INSTALL_DATA) $(TARGET_DIR)/$(TARGET_API)$(SO_EXT) $(RELSYSDIR)/priv/$(SYS_TYPE)
$(INSTALL_PROGRAM) $(TARGET_DIR)/$(TARGET_API)$(SO_EXT) $(RELSYSDIR)/priv/$(SYS_TYPE)

release_docs_spec:

Expand Down

0 comments on commit d3a3a83

Please sign in to comment.