diff options
| author | Erlang/OTP <[email protected]> | 2019-04-16 16:37:41 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2019-04-16 16:37:41 +0200 |
| commit | c231fd1d513272d144b3ba1d56930f74b15839d1 (patch) | |
| tree | 2df77daa5ed0742dd219327050ab541e21c8d429 /erts/emulator | |
| parent | 6bc51edfd7efb409230c0ca1dffb7508e65687f9 (diff) | |
| parent | 3d5876a20675a6987288afde6f9259a0758cb152 (diff) | |
| download | otp-c231fd1d513272d144b3ba1d56930f74b15839d1.tar.gz otp-c231fd1d513272d144b3ba1d56930f74b15839d1.tar.bz2 otp-c231fd1d513272d144b3ba1d56930f74b15839d1.zip | |
Merge branch 'rickard/make-fixes-20/OTP-15657' into maint-20
* rickard/make-fixes-20/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 1916b97a89..116b87affd 100644 --- a/erts/emulator/Makefile.in +++ b/erts/emulator/Makefile.in @@ -271,7 +271,6 @@ DEXPORT = @DEXPORT@ RANLIB = @RANLIB@ STRIP = strip PERL = @PERL@ -RM = @RM@ MKDIR = @MKDIR@ USING_MINGW=@MIXED_CYGWIN_MINGW@ @@ -461,13 +460,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 |