From 81dc511ebf76b133b2b29301c22515a1687bab8a Mon Sep 17 00:00:00 2001 From: Lukas Larsson Date: Mon, 3 Jan 2022 15:00:49 +0100 Subject: [PATCH] ssl: Fix sed of ssl/ssh deps file Closes #5548 --- lib/ssh/src/Makefile | 2 +- lib/ssl/src/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile index 88126f62891f..f5ed6d78c398 100644 --- a/lib/ssh/src/Makefile +++ b/lib/ssh/src/Makefile @@ -152,7 +152,7 @@ $(BEHAVIOUR_TARGET_FILES_2): $(BEHAVIOUR_TARGET_FILES_1) $(DEP_FILE): $(ERL_FILES) @echo SED $(TARGET) $(ERL_TOP_NATIVE) $(gen_verbose)erlc -M $(ERL_FILES) \ - | sed "s@[a-zA-Z]\?$(ERL_TOP_NATIVE)@../../..@g" \ + | perl -pe "s@ [a-zA-Z]?$(ERL_TOP_NATIVE)/(?:bootstrap/)?lib/([^/]+)@ ../../\1@g" 2> /dev/null \ | sed "s/\.$(EMULATOR)/\.$$\(EMULATOR\)/" \ | sed 's@^ssh_@$$(EBIN)/ssh_@' \ | sed 's@^sshc_@$$(EBIN)/sshc_@' \ diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile index c8d0d6f12f2e..2d28320ad006 100644 --- a/lib/ssl/src/Makefile +++ b/lib/ssl/src/Makefile @@ -182,7 +182,7 @@ $(TARGET_FILES): $(BEHAVIOUR_TARGET_FILES) $(DEP_FILE): $(ERL_FILES) @echo SED $(TARGET) $(ERL_TOP_NATIVE) $(gen_verbose)erlc -M $(ERL_FILES) \ - | sed "s@[a-zA-Z]\?$(ERL_TOP_NATIVE)/\(bootstrap/\)\?lib/\([^/]\+/\)@../../\2@g" \ + | perl -pe "s@ [a-zA-Z]?$(ERL_TOP_NATIVE)/(?:bootstrap/)?lib/([^/]+)@ ../../\1@g" 2> /dev/null \ | sed "s/\.$(EMULATOR)/\.$$\(EMULATOR\)/" \ | sed 's@^dtls_@$$(EBIN)/dtls_@' \ | sed 's@^inet_@$$(EBIN)/inet_@' \