Signed-off-by: Fedora Build <lemenkov@gmail.com>
This commit is contained in:
Fedora Build 2012-09-10 18:15:51 +04:00
parent 61833acd62
commit 52f46d3ddc

View File

@ -10,18 +10,14 @@ https://bugzilla.redhat.com/818419
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
lib/erl_interface/src/Makefile.in | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
lib/erl_interface/src/Makefile.in | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in
index 9aeba86..dafd2ce 100644
index 9aeba86..708d0a1 100644
--- a/lib/erl_interface/src/Makefile.in
+++ b/lib/erl_interface/src/Makefile.in
@@ -843,14 +843,33 @@ EXTRA = \
$(TARGET)/eidefs.mk
release: opt
+<<<<<<< HEAD
@@ -846,11 +846,29 @@ release: opt
$(INSTALL_DIR) "$(RELSYSDIR)/include"
$(INSTALL_DIR) "$(RELSYSDIR)/lib"
$(INSTALL_DIR) "$(RELSYSDIR)/bin"