diff options
| author | Lukas Larsson <[email protected]> | 2013-09-02 11:50:33 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2013-09-02 11:50:33 +0200 |
| commit | 698caba96be3a544e3841aa417f3ca5ab4d536f8 (patch) | |
| tree | 5dab3587e0923c44c326b0aa157821ba33930c40 | |
| parent | a2d3e57f475b391f9e338503a2a5eead78930e5d (diff) | |
| parent | b1b6087d7f52b4ac88c90b52be7b66f0e894e565 (diff) | |
| download | otp-698caba96be3a544e3841aa417f3ca5ab4d536f8.tar.gz otp-698caba96be3a544e3841aa417f3ca5ab4d536f8.tar.bz2 otp-698caba96be3a544e3841aa417f3ca5ab4d536f8.zip | |
Merge branch 'maint'
* maint:
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: |