diff options
| author | Rickard Green <[email protected]> | 2019-03-07 14:44:14 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2019-03-07 14:44:14 +0100 |
| commit | 1e05aaf67fdf7547d72e20ff5a272ad8912f9ae0 (patch) | |
| tree | 72b36887e44850e3b0f47ccecbba609dbe4437c9 /erts/emulator | |
| parent | c6508315fbaeee2e442c5623237a58f7e168d145 (diff) | |
| parent | fed10a7ed52488fc5de5873bf12443fc07097d89 (diff) | |
| download | otp-1e05aaf67fdf7547d72e20ff5a272ad8912f9ae0.tar.gz otp-1e05aaf67fdf7547d72e20ff5a272ad8912f9ae0.tar.bz2 otp-1e05aaf67fdf7547d72e20ff5a272ad8912f9ae0.zip | |
Merge branch 'rickard/make-fixes-21/OTP-15657' into maint
* rickard/make-fixes-21/OTP-15657:
Remove own configured RM make variable
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/Makefile.in | 15 |
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 |