diff options
| author | Lukas Larsson <[email protected]> | 2013-09-02 11:50:22 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2013-09-02 11:50:22 +0200 |
| commit | b1b6087d7f52b4ac88c90b52be7b66f0e894e565 (patch) | |
| tree | 6f65ce05817f93e4f1474ae171232600be4e6336 | |
| parent | 517879c44e0703b69fe8fc4499e656a318cd1a85 (diff) | |
| parent | 19a955f41f1ef06c0b863372e79e292b26c3dba5 (diff) | |
| download | otp-b1b6087d7f52b4ac88c90b52be7b66f0e894e565.tar.gz otp-b1b6087d7f52b4ac88c90b52be7b66f0e894e565.tar.bz2 otp-b1b6087d7f52b4ac88c90b52be7b66f0e894e565.zip | |
Merge branch 'lukas/export-ei-ic-headers-libs/OTP-11284' into maint
* lukas/export-ei-ic-headers-libs/OTP-11284:
ei ic: install headers and libs into usr
| -rw-r--r-- | lib/erl_interface/src/Makefile.in | 4 | ||||
| -rw-r--r-- | lib/ic/c_src/Makefile.in | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in index ebacc1cee0..e36b39c1fb 100644 --- a/lib/erl_interface/src/Makefile.in +++ b/lib/erl_interface/src/Makefile.in @@ -866,8 +866,12 @@ release: opt $(INSTALL_DIR) "$(RELSYSDIR)/src/misc" $(INSTALL_DIR) "$(RELSYSDIR)/src/prog" $(INSTALL_DIR) "$(RELSYSDIR)/src/registry" + $(INSTALL_DIR) "$(RELEASE_PATH)/usr/include" + $(INSTALL_DIR) "$(RELEASE_PATH)/usr/lib" $(INSTALL_DATA) $(HEADERS) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(HEADERS) "$(RELEASE_PATH)/usr/include" $(INSTALL_DATA) $(OBJ_TARGETS) "$(RELSYSDIR)/lib" + $(INSTALL_DATA) $(OBJ_TARGETS) "$(RELEASE_PATH)/usr/lib" ifneq ($(EXE_TARGETS),) $(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin" endif diff --git a/lib/ic/c_src/Makefile.in b/lib/ic/c_src/Makefile.in index 856823b1b3..6e65f06114 100644 --- a/lib/ic/c_src/Makefile.in +++ b/lib/ic/c_src/Makefile.in @@ -149,9 +149,13 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/c_src" $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/priv/lib" + $(INSTALL_DIR) "$(RELEASE_PATH)/usr/include" + $(INSTALL_DIR) "$(RELEASE_PATH)/usr/lib" $(INSTALL_DATA) ic.c ic_tmo.c "$(RELSYSDIR)/c_src" $(INSTALL_DATA) $(IDL_FILES) $(H_FILES) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(LIBRARY) "$(RELSYSDIR)/priv/lib" + $(INSTALL_DATA) $(IDL_FILES) $(H_FILES) "$(RELEASE_PATH)/usr/include" + $(INSTALL_DATA) $(LIBRARY) "$(RELEASE_PATH)/usr/lib" release_docs_spec: |