aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2019-03-06 20:39:28 +0100
committerRickard Green <[email protected]>2019-03-06 20:39:28 +0100
commitfed10a7ed52488fc5de5873bf12443fc07097d89 (patch)
tree7a7529e9a5677e8b0477c7d7d94fb84e645a71e4 /erts/emulator
parentb32a929bbb287c318f44cb0ecf17716c480f11ee (diff)
parent3d5876a20675a6987288afde6f9259a0758cb152 (diff)
downloadotp-fed10a7ed52488fc5de5873bf12443fc07097d89.tar.gz
otp-fed10a7ed52488fc5de5873bf12443fc07097d89.tar.bz2
otp-fed10a7ed52488fc5de5873bf12443fc07097d89.zip
Merge 'rickard/make-fixes-20/OTP-15657' into 'rickard/make-fixes-21/OTP-15657'
* rickard/make-fixes-20/OTP-15657: Remove own configured RM make variable
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/Makefile.in15
1 files changed, 7 insertions, 8 deletions
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in
index 57a9d45887..e7648f2396 100644
--- a/erts/emulator/Makefile.in
+++ b/erts/emulator/Makefile.in
@@ -266,7 +266,6 @@ DEXPORT = @DEXPORT@
RANLIB = @RANLIB@
STRIP = strip
PERL = @PERL@
-RM = @RM@
MKDIR = @MKDIR@
USING_MINGW=@MIXED_CYGWIN_MINGW@
@@ -467,13 +466,13 @@ $(ERTS_LIB):
.PHONY: clean
clean:
- $(RM) -f $(GENERATE)
- $(RM) -rf $(TARGET)/*.c $(TARGET)/*.h $(TARGET)/*-GENERATED
- $(RM) -rf $(TARGET)/*/*
- $(RM) -rf obj/$(TARGET)
- $(RM) -rf pcre/obj/$(TARGET) $(PCRE_GENINC)
- $(RM) -rf zlib/obj/$(TARGET)
- $(RM) -rf bin/$(TARGET)
+ $(RM) $(GENERATE)
+ $(RM) -r $(TARGET)/*.c $(TARGET)/*.h $(TARGET)/*-GENERATED
+ $(RM) -r $(TARGET)/*/*
+ $(RM) -r obj/$(TARGET)
+ $(RM) -r pcre/obj/$(TARGET) $(PCRE_GENINC)
+ $(RM) -r zlib/obj/$(TARGET)
+ $(RM) -r bin/$(TARGET)
cd $(ERTS_LIB_DIR) && $(MAKE) clean
.PHONY: docs