aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2019-03-06 20:35:07 +0100
committerRickard Green <[email protected]>2019-03-06 20:35:07 +0100
commitae393b30c79936def13790f7aa1e2dabef5b6174 (patch)
tree17c6387c7e605d7f167022743abd6a59e988e362 /erts/emulator
parent250462066db0344e5387d15ed2b89bce261ea64d (diff)
parentd9dd041acc211907b6cea4ae93f39c6319153d15 (diff)
downloadotp-ae393b30c79936def13790f7aa1e2dabef5b6174.tar.gz
otp-ae393b30c79936def13790f7aa1e2dabef5b6174.tar.bz2
otp-ae393b30c79936def13790f7aa1e2dabef5b6174.zip
Merge 'rickard/make-fixes-17/OTP-15657' into 'rickard/make-fixes-18/OTP-15657'
* rickard/make-fixes-17/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 a919f0e3ac..c1bed45331 100644
--- a/erts/emulator/Makefile.in
+++ b/erts/emulator/Makefile.in
@@ -249,7 +249,6 @@ ifneq ($(findstring ose,$(TARGET)),ose)
STRIP = strip
endif
PERL = @PERL@
-RM = @RM@
MKDIR = @MKDIR@
USING_MINGW=@MIXED_CYGWIN_MINGW@
@@ -439,13 +438,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