diff options
| author | Rickard Green <[email protected]> | 2019-03-06 20:37:04 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2019-03-06 20:37:04 +0100 |
| commit | 61fd5da42a039c8fd62d752339fa427c1d50cbf7 (patch) | |
| tree | fe670871f9cec79c788dbe6cf96330c4c6000fdb /erts/emulator | |
| parent | 565adc6d7ffb0778df06d5011ec56dc7b3eb0d2b (diff) | |
| parent | ae393b30c79936def13790f7aa1e2dabef5b6174 (diff) | |
| download | otp-61fd5da42a039c8fd62d752339fa427c1d50cbf7.tar.gz otp-61fd5da42a039c8fd62d752339fa427c1d50cbf7.tar.bz2 otp-61fd5da42a039c8fd62d752339fa427c1d50cbf7.zip | |
Merge 'rickard/make-fixes-18/OTP-15657' into 'rickard/make-fixes-19/OTP-15657'
* rickard/make-fixes-18/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 8772befe27..711dc3d6df 100644 --- a/erts/emulator/Makefile.in +++ b/erts/emulator/Makefile.in @@ -252,7 +252,6 @@ DEXPORT = @DEXPORT@ RANLIB = @RANLIB@ STRIP = strip PERL = @PERL@ -RM = @RM@ MKDIR = @MKDIR@ USING_MINGW=@MIXED_CYGWIN_MINGW@ @@ -442,13 +441,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 |