diff options
author | Marlus Saraiva <marlus.saraiva@gmail.com> | 2015-09-29 00:51:43 +0000 |
---|---|---|
committer | Francesco Colista <fcolista@alpinelinux.org> | 2015-10-01 14:00:00 +0000 |
commit | 82aba2912f2f430247b64e6b0ce19200114af9d6 (patch) | |
tree | 1a8aa4b656a543dd2e9e7aa09e2969b96f702139 /main/erlang/0006-Do-not-install-erlang-sources.patch | |
parent | cb948b70697c6a01c5e245b5fe75423167849058 (diff) | |
download | aports-82aba2912f2f430247b64e6b0ce19200114af9d6.tar.bz2 aports-82aba2912f2f430247b64e6b0ce19200114af9d6.tar.xz |
main/erlang: Update to 18.1
Diffstat (limited to 'main/erlang/0006-Do-not-install-erlang-sources.patch')
-rw-r--r-- | main/erlang/0006-Do-not-install-erlang-sources.patch | 531 |
1 files changed, 373 insertions, 158 deletions
diff --git a/main/erlang/0006-Do-not-install-erlang-sources.patch b/main/erlang/0006-Do-not-install-erlang-sources.patch index 8d14da5dca..9b7f421e59 100644 --- a/main/erlang/0006-Do-not-install-erlang-sources.patch +++ b/main/erlang/0006-Do-not-install-erlang-sources.patch @@ -1,14 +1,5 @@ -From: Hans Ulrich Niedermann <hun@n-dimensional.de> -Date: Mon, 21 Mar 2011 15:41:49 +0100 -Subject: [PATCH] Do not install erlang sources - -Don't install *.erl, *.xrl, *.yrl, and *.asn1 files at all. - -Signed-off-by: Peter Lemenkov <lemenkov@gmail.com> -Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> - ---- otp_src_18.0-orig/erts/preloaded/src/Makefile -+++ otp_src_18.0-fixed/erts/preloaded/src/Makefile +--- otp_src_18.1-orig/erts/preloaded/src/Makefile ++++ otp_src_18.1-fixed/erts/preloaded/src/Makefile @@ -86,8 +86,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -18,8 +9,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(STATIC_TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin" ---- otp_src_18.0-orig/lib/asn1/src/Makefile -+++ otp_src_18.0-fixed/lib/asn1/src/Makefile +--- otp_src_18.1-orig/lib/asn1/src/Makefile ++++ otp_src_18.1-fixed/lib/asn1/src/Makefile @@ -155,7 +155,7 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" @@ -29,8 +20,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/examples" $(INSTALL_DATA) $(EXAMPLES) "$(RELSYSDIR)/examples" ---- otp_src_18.0-orig/lib/common_test/src/Makefile -+++ otp_src_18.0-fixed/lib/common_test/src/Makefile +--- otp_src_18.1-orig/lib/common_test/src/Makefile ++++ otp_src_18.1-fixed/lib/common_test/src/Makefile @@ -144,7 +144,7 @@ release_spec: opt @@ -40,8 +31,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/include" ---- otp_src_18.0-orig/lib/compiler/src/Makefile -+++ otp_src_18.0-fixed/lib/compiler/src/Makefile +--- otp_src_18.1-orig/lib/compiler/src/Makefile ++++ otp_src_18.1-fixed/lib/compiler/src/Makefile @@ -172,8 +172,8 @@ release_spec: opt @@ -53,8 +44,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.0-orig/lib/cosEvent/src/Makefile -+++ otp_src_18.0-fixed/lib/cosEvent/src/Makefile +--- otp_src_18.1-orig/lib/cosEvent/src/Makefile ++++ otp_src_18.1-fixed/lib/cosEvent/src/Makefile @@ -203,7 +203,7 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" @@ -64,8 +55,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include" ---- otp_src_18.0-orig/lib/cosEventDomain/src/Makefile -+++ otp_src_18.0-fixed/lib/cosEventDomain/src/Makefile +--- otp_src_18.1-orig/lib/cosEventDomain/src/Makefile ++++ otp_src_18.1-fixed/lib/cosEventDomain/src/Makefile @@ -172,7 +172,7 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" @@ -75,8 +66,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(EXTERNAL_GEN_HRL_FILES) "$(RELSYSDIR)/include" ---- otp_src_18.0-orig/lib/cosFileTransfer/src/Makefile -+++ otp_src_18.0-fixed/lib/cosFileTransfer/src/Makefile +--- otp_src_18.1-orig/lib/cosFileTransfer/src/Makefile ++++ otp_src_18.1-fixed/lib/cosFileTransfer/src/Makefile @@ -180,9 +180,7 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" @@ -88,8 +79,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> - $(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include" release_docs_spec: ---- otp_src_18.0-orig/lib/cosNotification/src/Makefile -+++ otp_src_18.0-fixed/lib/cosNotification/src/Makefile +--- otp_src_18.1-orig/lib/cosNotification/src/Makefile ++++ otp_src_18.1-fixed/lib/cosNotification/src/Makefile @@ -371,8 +371,7 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" @@ -100,8 +91,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include" ---- otp_src_18.0-orig/lib/cosProperty/src/Makefile -+++ otp_src_18.0-fixed/lib/cosProperty/src/Makefile +--- otp_src_18.1-orig/lib/cosProperty/src/Makefile ++++ otp_src_18.1-fixed/lib/cosProperty/src/Makefile @@ -180,8 +180,7 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" @@ -112,8 +103,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include" ---- otp_src_18.0-orig/lib/cosTime/src/Makefile -+++ otp_src_18.0-fixed/lib/cosTime/src/Makefile +--- otp_src_18.1-orig/lib/cosTime/src/Makefile ++++ otp_src_18.1-fixed/lib/cosTime/src/Makefile @@ -199,8 +199,7 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" @@ -124,8 +115,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include" ---- otp_src_18.0-orig/lib/cosTransactions/src/Makefile -+++ otp_src_18.0-fixed/lib/cosTransactions/src/Makefile +--- otp_src_18.1-orig/lib/cosTransactions/src/Makefile ++++ otp_src_18.1-fixed/lib/cosTransactions/src/Makefile @@ -174,7 +174,7 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" @@ -135,8 +126,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(EXTERNAL_GEN_HRL_FILES) "$(RELSYSDIR)/include" ---- otp_src_18.0-orig/lib/crypto/src/Makefile -+++ otp_src_18.0-fixed/lib/crypto/src/Makefile +--- otp_src_18.1-orig/lib/crypto/src/Makefile ++++ otp_src_18.1-fixed/lib/crypto/src/Makefile @@ -82,8 +82,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -146,8 +137,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" ---- otp_src_18.0-orig/lib/debugger/src/Makefile -+++ otp_src_18.0-fixed/lib/debugger/src/Makefile +--- otp_src_18.1-orig/lib/debugger/src/Makefile ++++ otp_src_18.1-fixed/lib/debugger/src/Makefile @@ -117,7 +117,7 @@ release_spec: opt @@ -157,8 +148,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.0-orig/lib/dialyzer/src/Makefile -+++ otp_src_18.0-fixed/lib/dialyzer/src/Makefile +--- otp_src_18.1-orig/lib/dialyzer/src/Makefile ++++ otp_src_18.1-fixed/lib/dialyzer/src/Makefile @@ -152,7 +152,7 @@ release_spec: opt @@ -168,8 +159,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.0-orig/lib/diameter/src/Makefile -+++ otp_src_18.0-fixed/lib/diameter/src/Makefile +--- otp_src_18.1-orig/lib/diameter/src/Makefile ++++ otp_src_18.1-fixed/lib/diameter/src/Makefile @@ -251,11 +251,8 @@ $(MAKE) $(EXAMPLE_DIRS:%/=release_examples_%) @@ -184,8 +175,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(EXAMPLE_DIRS:%/=release_examples_%): release_examples_%: $(INSTALL_DIR) "$(RELSYSDIR)/examples/$*" ---- otp_src_18.0-orig/lib/edoc/src/Makefile -+++ otp_src_18.0-fixed/lib/edoc/src/Makefile +--- otp_src_18.1-orig/lib/edoc/src/Makefile ++++ otp_src_18.1-fixed/lib/edoc/src/Makefile @@ -88,7 +88,7 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(OBJECTS) "$(RELSYSDIR)/ebin" @@ -195,8 +186,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> release_docs_spec: ---- otp_src_18.0-orig/lib/eldap/src/Makefile -+++ otp_src_18.0-fixed/lib/eldap/src/Makefile +--- otp_src_18.1-orig/lib/eldap/src/Makefile ++++ otp_src_18.1-fixed/lib/eldap/src/Makefile @@ -99,10 +99,6 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/ebin" @@ -208,8 +199,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" ---- otp_src_18.0-orig/lib/erl_docgen/src/Makefile -+++ otp_src_18.0-fixed/lib/erl_docgen/src/Makefile +--- otp_src_18.1-orig/lib/erl_docgen/src/Makefile ++++ otp_src_18.1-fixed/lib/erl_docgen/src/Makefile @@ -90,8 +90,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -219,8 +210,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.0-orig/lib/et/src/Makefile -+++ otp_src_18.0-fixed/lib/et/src/Makefile +--- otp_src_18.1-orig/lib/et/src/Makefile ++++ otp_src_18.1-fixed/lib/et/src/Makefile @@ -109,7 +109,6 @@ $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" @@ -229,8 +220,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" ---- otp_src_18.0-orig/lib/eunit/src/Makefile -+++ otp_src_18.0-fixed/lib/eunit/src/Makefile +--- otp_src_18.1-orig/lib/eunit/src/Makefile ++++ otp_src_18.1-fixed/lib/eunit/src/Makefile @@ -120,7 +120,6 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(PARSE_TRANSFORM_BIN) $(OBJECTS) "$(RELSYSDIR)/ebin" @@ -239,8 +230,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include" ---- otp_src_18.0-orig/lib/gs/src/Makefile -+++ otp_src_18.0-fixed/lib/gs/src/Makefile +--- otp_src_18.1-orig/lib/gs/src/Makefile ++++ otp_src_18.1-fixed/lib/gs/src/Makefile @@ -109,8 +109,8 @@ release_spec: opt @@ -252,8 +243,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/priv/bitmap" ---- otp_src_18.0-orig/lib/hipe/cerl/Makefile -+++ otp_src_18.0-fixed/lib/hipe/cerl/Makefile +--- otp_src_18.1-orig/lib/hipe/cerl/Makefile ++++ otp_src_18.1-fixed/lib/hipe/cerl/Makefile @@ -102,7 +102,7 @@ release_spec: opt @@ -263,8 +254,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.0-orig/lib/hipe/flow/Makefile -+++ otp_src_18.0-fixed/lib/hipe/flow/Makefile +--- otp_src_18.1-orig/lib/hipe/flow/Makefile ++++ otp_src_18.1-fixed/lib/hipe/flow/Makefile @@ -102,7 +102,7 @@ release_spec: opt @@ -274,8 +265,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.0-orig/lib/hipe/icode/Makefile -+++ otp_src_18.0-fixed/lib/hipe/icode/Makefile +--- otp_src_18.1-orig/lib/hipe/icode/Makefile ++++ otp_src_18.1-fixed/lib/hipe/icode/Makefile @@ -120,7 +120,7 @@ release_spec: opt @@ -285,8 +276,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.0-orig/lib/hipe/llvm/Makefile -+++ otp_src_18.0-fixed/lib/hipe/llvm/Makefile +--- otp_src_18.1-orig/lib/hipe/llvm/Makefile ++++ otp_src_18.1-fixed/lib/hipe/llvm/Makefile @@ -103,7 +103,7 @@ release_spec: opt @@ -296,8 +287,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) $(RELSYSDIR)/ebin $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin ---- otp_src_18.0-orig/lib/hipe/main/Makefile -+++ otp_src_18.0-fixed/lib/hipe/main/Makefile +--- otp_src_18.1-orig/lib/hipe/main/Makefile ++++ otp_src_18.1-fixed/lib/hipe/main/Makefile @@ -118,7 +118,7 @@ release_spec: opt $(INSTALL_DATA) ../vsn.mk "$(RELSYSDIR)" @@ -307,8 +298,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.0-orig/lib/hipe/misc/Makefile -+++ otp_src_18.0-fixed/lib/hipe/misc/Makefile +--- otp_src_18.1-orig/lib/hipe/misc/Makefile ++++ otp_src_18.1-fixed/lib/hipe/misc/Makefile @@ -102,7 +102,7 @@ release_spec: opt @@ -318,8 +309,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.0-orig/lib/hipe/rtl/Makefile -+++ otp_src_18.0-fixed/lib/hipe/rtl/Makefile +--- otp_src_18.1-orig/lib/hipe/rtl/Makefile ++++ otp_src_18.1-fixed/lib/hipe/rtl/Makefile @@ -105,7 +105,7 @@ release_spec: opt @@ -329,8 +320,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.0-orig/lib/hipe/util/Makefile -+++ otp_src_18.0-fixed/lib/hipe/util/Makefile +--- otp_src_18.1-orig/lib/hipe/util/Makefile ++++ otp_src_18.1-fixed/lib/hipe/util/Makefile @@ -50,7 +50,6 @@ endif MODULES = hipe_timing hipe_dot hipe_digraph $(HIPE_MODULES) @@ -348,8 +339,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.0-orig/lib/ic/src/Makefile -+++ otp_src_18.0-fixed/lib/ic/src/Makefile +--- otp_src_18.1-orig/lib/ic/src/Makefile ++++ otp_src_18.1-fixed/lib/ic/src/Makefile @@ -200,7 +200,7 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin" @@ -359,8 +350,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/examples" $(INSTALL_DIR) "$(RELSYSDIR)/examples/c-client" $(INSTALL_DATA) $(CCL_EX_FILES) "$(RELSYSDIR)/examples/c-client" ---- otp_src_18.0-orig/lib/inets/src/ftp/Makefile -+++ otp_src_18.0-fixed/lib/inets/src/ftp/Makefile +--- otp_src_18.1-orig/lib/inets/src/ftp/Makefile ++++ otp_src_18.1-fixed/lib/inets/src/ftp/Makefile @@ -91,7 +91,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -370,8 +361,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.0-orig/lib/inets/src/http_client/Makefile -+++ otp_src_18.0-fixed/lib/inets/src/http_client/Makefile +--- otp_src_18.1-orig/lib/inets/src/http_client/Makefile ++++ otp_src_18.1-fixed/lib/inets/src/http_client/Makefile @@ -92,7 +92,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -381,8 +372,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.0-orig/lib/inets/src/http_lib/Makefile -+++ otp_src_18.0-fixed/lib/inets/src/http_lib/Makefile +--- otp_src_18.1-orig/lib/inets/src/http_lib/Makefile ++++ otp_src_18.1-fixed/lib/inets/src/http_lib/Makefile @@ -90,7 +90,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -392,8 +383,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.0-orig/lib/inets/src/http_server/Makefile -+++ otp_src_18.0-fixed/lib/inets/src/http_server/Makefile +--- otp_src_18.1-orig/lib/inets/src/http_server/Makefile ++++ otp_src_18.1-fixed/lib/inets/src/http_server/Makefile @@ -127,7 +127,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -403,8 +394,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.0-orig/lib/inets/src/inets_app/Makefile -+++ otp_src_18.0-fixed/lib/inets/src/inets_app/Makefile +--- otp_src_18.1-orig/lib/inets/src/inets_app/Makefile ++++ otp_src_18.1-fixed/lib/inets/src/inets_app/Makefile @@ -116,7 +116,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -414,8 +405,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" ---- otp_src_18.0-orig/lib/inets/src/tftp/Makefile -+++ otp_src_18.0-fixed/lib/inets/src/tftp/Makefile +--- otp_src_18.1-orig/lib/inets/src/tftp/Makefile ++++ otp_src_18.1-fixed/lib/inets/src/tftp/Makefile @@ -96,7 +96,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -425,8 +416,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.0-orig/lib/kernel/src/Makefile -+++ otp_src_18.0-fixed/lib/kernel/src/Makefile +--- otp_src_18.1-orig/lib/kernel/src/Makefile ++++ otp_src_18.1-fixed/lib/kernel/src/Makefile @@ -200,7 +200,6 @@ release_spec: opt @@ -435,8 +426,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" ---- otp_src_18.0-orig/lib/megaco/src/app/Makefile -+++ otp_src_18.0-fixed/lib/megaco/src/app/Makefile +--- otp_src_18.1-orig/lib/megaco/src/app/Makefile ++++ otp_src_18.1-fixed/lib/megaco/src/app/Makefile @@ -114,7 +114,7 @@ $(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -446,8 +437,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" ---- otp_src_18.0-orig/lib/megaco/src/binary/Makefile -+++ otp_src_18.0-fixed/lib/megaco/src/binary/Makefile +--- otp_src_18.1-orig/lib/megaco/src/binary/Makefile ++++ otp_src_18.1-fixed/lib/megaco/src/binary/Makefile @@ -176,7 +176,7 @@ $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -457,8 +448,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> release_docs_spec: ---- otp_src_18.0-orig/lib/megaco/src/engine/Makefile -+++ otp_src_18.0-fixed/lib/megaco/src/engine/Makefile +--- otp_src_18.1-orig/lib/megaco/src/engine/Makefile ++++ otp_src_18.1-fixed/lib/megaco/src/engine/Makefile @@ -102,7 +102,7 @@ $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -468,8 +459,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/include" ---- otp_src_18.0-orig/lib/megaco/src/flex/Makefile.in -+++ otp_src_18.0-fixed/lib/megaco/src/flex/Makefile.in +--- otp_src_18.1-orig/lib/megaco/src/flex/Makefile.in ++++ otp_src_18.1-fixed/lib/megaco/src/flex/Makefile.in @@ -268,8 +268,6 @@ $(INSTALL_DIR) "$(RELSYSDIR)/src/flex" $(INSTALL_DIR) "$(RELSYSDIR)/priv/lib" @@ -479,8 +470,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true) $(INSTALL_DATA) $(FLEX_FILES) "$(RELSYSDIR)/src/flex" $(INSTALL_PROGRAM) $(SOLIBS) "$(RELSYSDIR)/priv/lib" ---- otp_src_18.0-orig/lib/megaco/src/tcp/Makefile -+++ otp_src_18.0-fixed/lib/megaco/src/tcp/Makefile +--- otp_src_18.1-orig/lib/megaco/src/tcp/Makefile ++++ otp_src_18.1-fixed/lib/megaco/src/tcp/Makefile @@ -94,7 +94,7 @@ $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -490,8 +481,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> release_docs_spec: ---- otp_src_18.0-orig/lib/megaco/src/text/Makefile -+++ otp_src_18.0-fixed/lib/megaco/src/text/Makefile +--- otp_src_18.1-orig/lib/megaco/src/text/Makefile ++++ otp_src_18.1-fixed/lib/megaco/src/text/Makefile @@ -135,7 +135,7 @@ $(INSTALL_DATA) $(BEAM_TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -501,8 +492,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> release_docs_spec: ---- otp_src_18.0-orig/lib/megaco/src/udp/Makefile -+++ otp_src_18.0-fixed/lib/megaco/src/udp/Makefile +--- otp_src_18.1-orig/lib/megaco/src/udp/Makefile ++++ otp_src_18.1-fixed/lib/megaco/src/udp/Makefile @@ -94,7 +94,7 @@ $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -512,8 +503,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> release_docs_spec: ---- otp_src_18.0-orig/lib/mnesia/src/Makefile -+++ otp_src_18.0-fixed/lib/mnesia/src/Makefile +--- otp_src_18.1-orig/lib/mnesia/src/Makefile ++++ otp_src_18.1-fixed/lib/mnesia/src/Makefile @@ -133,7 +133,7 @@ release_spec: opt @@ -523,8 +514,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.0-orig/lib/observer/src/Makefile -+++ otp_src_18.0-fixed/lib/observer/src/Makefile +--- otp_src_18.1-orig/lib/observer/src/Makefile ++++ otp_src_18.1-fixed/lib/observer/src/Makefile @@ -152,7 +152,6 @@ release_spec: opt @@ -533,8 +524,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/examples" $(INSTALL_DATA) $(EXAMPLE_FILES) "$(RELSYSDIR)/examples" ---- otp_src_18.0-orig/lib/odbc/src/Makefile -+++ otp_src_18.0-fixed/lib/odbc/src/Makefile +--- otp_src_18.1-orig/lib/odbc/src/Makefile ++++ otp_src_18.1-fixed/lib/odbc/src/Makefile @@ -110,7 +110,7 @@ release_spec: opt @@ -544,8 +535,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(EXT_HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" ---- otp_src_18.0-orig/lib/orber/COSS/CosNaming/Makefile -+++ otp_src_18.0-fixed/lib/orber/COSS/CosNaming/Makefile +--- otp_src_18.1-orig/lib/orber/COSS/CosNaming/Makefile ++++ otp_src_18.1-fixed/lib/orber/COSS/CosNaming/Makefile @@ -145,8 +145,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin" @@ -557,8 +548,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> release_docs_spec: ---- otp_src_18.0-orig/lib/orber/src/Makefile -+++ otp_src_18.0-fixed/lib/orber/src/Makefile +--- otp_src_18.1-orig/lib/orber/src/Makefile ++++ otp_src_18.1-fixed/lib/orber/src/Makefile @@ -253,7 +253,7 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" @@ -568,8 +559,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(GEN_HRL_FILES_EXT) "$(RELSYSDIR)/include" ---- otp_src_18.0-orig/lib/os_mon/src/Makefile -+++ otp_src_18.0-fixed/lib/os_mon/src/Makefile +--- otp_src_18.1-orig/lib/os_mon/src/Makefile ++++ otp_src_18.1-fixed/lib/os_mon/src/Makefile @@ -105,7 +105,6 @@ release_spec: opt @@ -578,8 +569,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.0-orig/lib/ose/src/Makefile -+++ otp_src_18.0-fixed/lib/ose/src/Makefile +--- otp_src_18.1-orig/lib/ose/src/Makefile ++++ otp_src_18.1-fixed/lib/ose/src/Makefile @@ -94,9 +94,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -590,8 +581,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.0-orig/lib/otp_mibs/src/Makefile -+++ otp_src_18.0-fixed/lib/otp_mibs/src/Makefile +--- otp_src_18.1-orig/lib/otp_mibs/src/Makefile ++++ otp_src_18.1-fixed/lib/otp_mibs/src/Makefile @@ -96,8 +96,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -601,8 +592,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGETS) "$(RELSYSDIR)/ebin" ---- otp_src_18.0-orig/lib/parsetools/src/Makefile -+++ otp_src_18.0-fixed/lib/parsetools/src/Makefile +--- otp_src_18.1-orig/lib/parsetools/src/Makefile ++++ otp_src_18.1-fixed/lib/parsetools/src/Makefile @@ -91,8 +91,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -612,8 +603,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/include" ---- otp_src_18.0-orig/lib/percept/src/Makefile -+++ otp_src_18.0-fixed/lib/percept/src/Makefile +--- otp_src_18.1-orig/lib/percept/src/Makefile ++++ otp_src_18.1-fixed/lib/percept/src/Makefile @@ -97,7 +97,6 @@ release_spec: opt @@ -622,8 +613,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" # $(INSTALL_DIR) "$(RELSYSDIR)/include" # $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" ---- otp_src_18.0-orig/lib/public_key/asn1/Makefile -+++ otp_src_18.0-fixed/lib/public_key/asn1/Makefile +--- otp_src_18.1-orig/lib/public_key/asn1/Makefile ++++ otp_src_18.1-fixed/lib/public_key/asn1/Makefile @@ -96,8 +96,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" @@ -635,8 +626,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.0-orig/lib/public_key/src/Makefile -+++ otp_src_18.0-fixed/lib/public_key/src/Makefile +--- otp_src_18.1-orig/lib/public_key/src/Makefile ++++ otp_src_18.1-fixed/lib/public_key/src/Makefile @@ -50,8 +50,6 @@ HRL_FILES = $(INCLUDE)/public_key.hrl @@ -655,8 +646,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" ---- otp_src_18.0-orig/lib/reltool/src/Makefile -+++ otp_src_18.0-fixed/lib/reltool/src/Makefile +--- otp_src_18.1-orig/lib/reltool/src/Makefile ++++ otp_src_18.1-fixed/lib/reltool/src/Makefile @@ -100,7 +100,7 @@ release_spec: opt @@ -666,8 +657,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" ---- otp_src_18.0-orig/lib/runtime_tools/src/Makefile -+++ otp_src_18.0-fixed/lib/runtime_tools/src/Makefile +--- otp_src_18.1-orig/lib/runtime_tools/src/Makefile ++++ otp_src_18.1-fixed/lib/runtime_tools/src/Makefile @@ -97,8 +97,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -677,8 +668,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/examples" ---- otp_src_18.0-orig/lib/sasl/src/Makefile -+++ otp_src_18.0-fixed/lib/sasl/src/Makefile +--- otp_src_18.1-orig/lib/sasl/src/Makefile ++++ otp_src_18.1-fixed/lib/sasl/src/Makefile @@ -93,7 +93,6 @@ release_spec: opt @@ -687,8 +678,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.0-orig/lib/snmp/src/agent/Makefile -+++ otp_src_18.0-fixed/lib/snmp/src/agent/Makefile +--- otp_src_18.1-orig/lib/snmp/src/agent/Makefile ++++ otp_src_18.1-fixed/lib/snmp/src/agent/Makefile @@ -131,7 +131,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -698,8 +689,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" ---- otp_src_18.0-orig/lib/snmp/src/app/Makefile -+++ otp_src_18.0-fixed/lib/snmp/src/app/Makefile +--- otp_src_18.1-orig/lib/snmp/src/app/Makefile ++++ otp_src_18.1-fixed/lib/snmp/src/app/Makefile @@ -132,7 +132,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -709,8 +700,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" ---- otp_src_18.0-orig/lib/snmp/src/compile/Makefile -+++ otp_src_18.0-fixed/lib/snmp/src/compile/Makefile +--- otp_src_18.1-orig/lib/snmp/src/compile/Makefile ++++ otp_src_18.1-fixed/lib/snmp/src/compile/Makefile @@ -123,7 +123,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -720,8 +711,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(EBIN_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/bin" ---- otp_src_18.0-orig/lib/snmp/src/manager/Makefile -+++ otp_src_18.0-fixed/lib/snmp/src/manager/Makefile +--- otp_src_18.1-orig/lib/snmp/src/manager/Makefile ++++ otp_src_18.1-fixed/lib/snmp/src/manager/Makefile @@ -114,7 +114,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -731,8 +722,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" # $(INSTALL_DIR) "$(RELSYSDIR)/include" ---- otp_src_18.0-orig/lib/snmp/src/misc/Makefile -+++ otp_src_18.0-fixed/lib/snmp/src/misc/Makefile +--- otp_src_18.1-orig/lib/snmp/src/misc/Makefile ++++ otp_src_18.1-fixed/lib/snmp/src/misc/Makefile @@ -112,7 +112,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -742,9 +733,9 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" # $(INSTALL_DIR) "$(RELSYSDIR)/include" ---- otp_src_18.0-orig/lib/ssh/src/Makefile -+++ otp_src_18.0-fixed/lib/ssh/src/Makefile -@@ -136,7 +136,7 @@ +--- otp_src_18.1-orig/lib/ssh/src/Makefile ++++ otp_src_18.1-fixed/lib/ssh/src/Makefile +@@ -135,7 +135,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -753,8 +744,232 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" ---- otp_src_18.0-orig/lib/ssl/src/Makefile -+++ otp_src_18.0-fixed/lib/ssl/src/Makefile +--- /dev/null ++++ otp_src_18.1-fixed/lib/ssh/src/Makefile.orig +@@ -0,0 +1,221 @@ ++# ++# %CopyrightBegin% ++# ++# Copyright Ericsson AB 2004-2013. All Rights Reserved. ++# ++# Licensed under the Apache License, Version 2.0 (the "License"); ++# you may not use this file except in compliance with the License. ++# You may obtain a copy of the License at ++# ++# http://www.apache.org/licenses/LICENSE-2.0 ++# ++# Unless required by applicable law or agreed to in writing, software ++# distributed under the License is distributed on an "AS IS" BASIS, ++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++# See the License for the specific language governing permissions and ++# limitations under the License. ++# ++# %CopyrightEnd% ++# ++ ++# ++include $(ERL_TOP)/make/target.mk ++include $(ERL_TOP)/make/$(TARGET)/otp.mk ++ ++# ---------------------------------------------------- ++# Application version ++# ---------------------------------------------------- ++include ../vsn.mk ++VSN=$(SSH_VSN) ++ ++# ---------------------------------------------------- ++# Release directory specification ++# ---------------------------------------------------- ++RELSYSDIR = $(RELEASE_PATH)/lib/ssh-$(VSN) ++ ++# ---------------------------------------------------- ++# Common Macros ++# ---------------------------------------------------- ++ ++# Behaviour (api) modules are first so they are compiled when ++# the compiler reaches a callback module using them. ++BEHAVIOUR_MODULES= \ ++ ssh_sftpd_file_api \ ++ ssh_channel \ ++ ssh_daemon_channel \ ++ ssh_client_key_api \ ++ ssh_server_key_api ++ ++MODULES= \ ++ ssh \ ++ ssh_sup \ ++ sshc_sup \ ++ sshd_sup \ ++ ssh_connection_sup \ ++ ssh_connection \ ++ ssh_connection_handler \ ++ ssh_shell \ ++ ssh_system_sup \ ++ ssh_subsystem_sup \ ++ ssh_channel_sup \ ++ ssh_acceptor_sup \ ++ ssh_acceptor \ ++ ssh_app \ ++ ssh_auth\ ++ ssh_bits \ ++ ssh_cli \ ++ ssh_file \ ++ ssh_io \ ++ ssh_info \ ++ ssh_message \ ++ ssh_no_io \ ++ ssh_sftp \ ++ ssh_sftpd \ ++ ssh_sftpd_file\ ++ ssh_transport \ ++ ssh_xfer ++ ++HRL_FILES = ++ ++ERL_FILES= \ ++ $(MODULES:%=%.erl) \ ++ $(BEHAVIOUR_MODULES:%=%.erl) ++ ++ ++TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) ++ ++BEHAVIOUR_TARGET_FILES= $(BEHAVIOUR_MODULES:%=$(EBIN)/%.$(EMULATOR)) ++ ++APP_FILE= ssh.app ++APPUP_FILE= ssh.appup ++ ++APP_SRC= $(APP_FILE).src ++APP_TARGET= $(EBIN)/$(APP_FILE) ++ ++APPUP_SRC= $(APPUP_FILE).src ++APPUP_TARGET= $(EBIN)/$(APPUP_FILE) ++ ++INTERNAL_HRL_FILES = ssh_auth.hrl ssh_connect.hrl ssh_transport.hrl ssh.hrl ssh_userauth.hrl ssh_xfer.hrl ++ ++# ---------------------------------------------------- ++# FLAGS ++# ---------------------------------------------------- ++EXTRA_ERLC_FLAGS = +warn_unused_vars ++ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/kernel/src \ ++ -pz $(EBIN) \ ++ -pz $(ERL_TOP)/lib/public_key/ebin \ ++ $(EXTRA_ERLC_FLAGS) ++ ++ ++# ---------------------------------------------------- ++# Targets ++# ---------------------------------------------------- ++ ++$(TARGET_FILES): $(BEHAVIOUR_TARGET_FILES) ++ ++debug opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) ++ ++clean: ++ rm -f $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(BEHAVIOUR_TARGET_FILES) ++ rm -f errs core *~ ++ ++$(APP_TARGET): $(APP_SRC) ../vsn.mk ++ $(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@ ++ ++$(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk ++ $(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@ ++ ++ ++docs: ++ ++# ---------------------------------------------------- ++# Release Target ++# ---------------------------------------------------- ++include $(ERL_TOP)/make/otp_release_targets.mk ++ ++release_spec: opt ++ $(INSTALL_DIR) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" ++ $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ ++ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" ++ $(INSTALL_DIR) "$(RELSYSDIR)/include" ++ ++ ++release_docs_spec: ++ ++ ++deps: ++ erlc -M $(ERL_FILES) \ ++ | sed 's@$(ERL_TOP)/lib@../..@g' \ ++ | sed 's/\.$(EMULATOR)/\.$$\(EMULATOR\)/' \ ++ | sed 's@^ssh_@$$(EBIN)/ssh_@' ++ ++ssh.$(EMULATOR): ssh.erl ssh.hrl ssh_connect.hrl \ ++ ../../public_key/include/public_key.hrl \ ++ ../../public_key/include/OTP-PUB-KEY.hrl \ ++ ../../public_key/include/PKCS-FRAME.hrl \ ++ ../../kernel/include/file.hrl ++$(EBIN)/ssh_sup.$(EMULATOR): ssh_sup.erl ++sshc_sup.$(EMULATOR): sshc_sup.erl ++sshd_sup.$(EMULATOR): sshd_sup.erl ssh.hrl ++$(EBIN)/ssh_connection_sup.$(EMULATOR): ssh_connection_sup.erl ++$(EBIN)/ssh_connection.$(EMULATOR): ssh_connection.erl ssh.hrl ssh_connect.hrl \ ++ ssh_transport.hrl ++$(EBIN)/ssh_connection_handler.$(EMULATOR): ssh_connection_handler.erl ssh.hrl \ ++ ssh_transport.hrl ssh_auth.hrl ssh_connect.hrl ++$(EBIN)/ssh_shell.$(EMULATOR): ssh_shell.erl ssh_connect.hrl ++$(EBIN)/ssh_system_sup.$(EMULATOR): ssh_system_sup.erl ssh.hrl ++$(EBIN)/ssh_subsystem_sup.$(EMULATOR): ssh_subsystem_sup.erl ++$(EBIN)/ssh_channel_sup.$(EMULATOR): ssh_channel_sup.erl ++$(EBIN)/ssh_acceptor_sup.$(EMULATOR): ssh_acceptor_sup.erl ssh.hrl ++$(EBIN)/ssh_acceptor.$(EMULATOR): ssh_acceptor.erl ssh.hrl ++$(EBIN)/ssh_app.$(EMULATOR): ssh_app.erl ++$(EBIN)/ssh_auth.$(EMULATOR): ssh_auth.erl \ ++ ../../public_key/include/public_key.hrl \ ++ ../../public_key/include/OTP-PUB-KEY.hrl \ ++ ../../public_key/include/PKCS-FRAME.hrl \ ++ ssh.hrl ssh_auth.hrl ssh_transport.hrl ++$(EBIN)/ssh_bits.$(EMULATOR): ssh_bits.erl ssh.hrl ++$(EBIN)/ssh_cli.$(EMULATOR): ssh_cli.erl ssh.hrl ssh_connect.hrl ++$(EBIN)/ssh_file.$(EMULATOR): ssh_file.erl \ ++ ../../public_key/include/public_key.hrl \ ++ ../../public_key/include/OTP-PUB-KEY.hrl \ ++ ../../public_key/include/PKCS-FRAME.hrl \ ++ ../../kernel/include/file.hrl ssh.hrl ++$(EBIN)/ssh_io.$(EMULATOR): ssh_io.erl ssh.hrl ++$(EBIN)/ssh_info.$(EMULATOR): ssh_info.erl ++$(EBIN)/ssh_message.$(EMULATOR): ssh_message.erl \ ++ ../../public_key/include/public_key.hrl \ ++ ../../public_key/include/OTP-PUB-KEY.hrl \ ++ ../../public_key/include/PKCS-FRAME.hrl \ ++ ssh.hrl ssh_connect.hrl ssh_auth.hrl ssh_transport.hrl ++$(EBIN)/ssh_no_io.$(EMULATOR): ssh_no_io.erl ssh_transport.hrl ++$(EBIN)/ssh_sftp.$(EMULATOR): ssh_sftp.erl \ ++ ../../kernel/include/file.hrl ssh.hrl \ ++ ssh_xfer.hrl ++$(EBIN)/ssh_sftpd.$(EMULATOR): ssh_sftpd.erl \ ++ ../../kernel/include/file.hrl ssh.hrl \ ++ ssh_xfer.hrl ++$(EBIN)/ssh_sftpd_file.$(EMULATOR): ssh_sftpd_file.erl ++$(EBIN)/ssh_transport.$(EMULATOR): ssh_transport.erl \ ++ ../../public_key/include/public_key.hrl \ ++ ../../public_key/include/OTP-PUB-KEY.hrl \ ++ ../../public_key/include/PKCS-FRAME.hrl \ ++ ../../kernel/include/inet.hrl \ ++ ssh_transport.hrl ssh.hrl ++$(EBIN)/ssh_xfer.$(EMULATOR): ssh_xfer.erl ssh.hrl ssh_xfer.hrl ++$(EBIN)/ssh_sftpd_file_api.$(EMULATOR): ssh_sftpd_file_api.erl ++$(EBIN)/ssh_channel.$(EMULATOR): ssh_channel.erl ssh_connect.hrl ++$(EBIN)/ssh_daemon_channel.$(EMULATOR): ssh_daemon_channel.erl ++$(EBIN)/ssh_client_key_api.$(EMULATOR): ssh_client_key_api.erl \ ++ ../../public_key/include/public_key.hrl \ ++ ../../public_key/include/OTP-PUB-KEY.hrl \ ++ ../../public_key/include/PKCS-FRAME.hrl \ ++ ssh.hrl ++$(EBIN)/ssh_server_key_api.$(EMULATOR): ssh_server_key_api.erl \ ++ ../../public_key/include/public_key.hrl \ ++ ../../public_key/include/OTP-PUB-KEY.hrl \ ++ ../../public_key/include/PKCS-FRAME.hrl \ ++ ssh.hrl ++ +--- otp_src_18.1-orig/lib/ssl/src/Makefile ++++ otp_src_18.1-fixed/lib/ssl/src/Makefile @@ -141,7 +141,7 @@ release_spec: opt @@ -764,8 +979,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" ---- otp_src_18.0-orig/lib/stdlib/src/Makefile -+++ otp_src_18.0-fixed/lib/stdlib/src/Makefile +--- otp_src_18.1-orig/lib/stdlib/src/Makefile ++++ otp_src_18.1-fixed/lib/stdlib/src/Makefile @@ -207,7 +207,6 @@ release_spec: opt @@ -774,8 +989,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" ---- otp_src_18.0-orig/lib/syntax_tools/src/Makefile -+++ otp_src_18.0-fixed/lib/syntax_tools/src/Makefile +--- otp_src_18.1-orig/lib/syntax_tools/src/Makefile ++++ otp_src_18.1-fixed/lib/syntax_tools/src/Makefile @@ -100,8 +100,6 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/ebin" @@ -785,8 +1000,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include" ---- otp_src_18.0-orig/lib/test_server/src/Makefile -+++ otp_src_18.0-fixed/lib/test_server/src/Makefile +--- otp_src_18.1-orig/lib/test_server/src/Makefile ++++ otp_src_18.1-fixed/lib/test_server/src/Makefile @@ -124,7 +124,6 @@ release_spec: opt @@ -795,8 +1010,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(TS_HRL_FILES) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" ---- otp_src_18.0-orig/lib/tools/src/Makefile -+++ otp_src_18.0-fixed/lib/tools/src/Makefile +--- otp_src_18.1-orig/lib/tools/src/Makefile ++++ otp_src_18.1-fixed/lib/tools/src/Makefile @@ -107,7 +107,7 @@ release_spec: opt @@ -806,8 +1021,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" ---- otp_src_18.0-orig/lib/typer/src/Makefile -+++ otp_src_18.0-fixed/lib/typer/src/Makefile +--- otp_src_18.1-orig/lib/typer/src/Makefile ++++ otp_src_18.1-fixed/lib/typer/src/Makefile @@ -102,9 +102,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -818,8 +1033,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.0-orig/lib/webtool/src/Makefile -+++ otp_src_18.0-fixed/lib/webtool/src/Makefile +--- otp_src_18.1-orig/lib/webtool/src/Makefile ++++ otp_src_18.1-fixed/lib/webtool/src/Makefile @@ -88,8 +88,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -829,8 +1044,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" ---- otp_src_18.0-orig/lib/wx/src/Makefile -+++ otp_src_18.0-fixed/lib/wx/src/Makefile +--- otp_src_18.1-orig/lib/wx/src/Makefile ++++ otp_src_18.1-fixed/lib/wx/src/Makefile @@ -122,9 +122,9 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -843,8 +1058,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de> $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(EXT_HRL) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" ---- otp_src_18.0-orig/lib/xmerl/src/Makefile -+++ otp_src_18.0-fixed/lib/xmerl/src/Makefile +--- otp_src_18.1-orig/lib/xmerl/src/Makefile ++++ otp_src_18.1-fixed/lib/xmerl/src/Makefile @@ -218,9 +218,7 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" |