make dist-clean should remove javacservers directory

Ivan Gerasimov ivan.gerasimov at
Thu Aug 1 20:48:39 UTC 2013


When sjavac is enabled, configure creates $OUTPUT_ROOT/javacservers 
However, make dist-clean doesn't remove it.

Please find a simple fix below.

Sincerely yours,

diff --git a/common/makefiles/Main.gmk b/common/makefiles/Main.gmk
--- a/common/makefiles/Main.gmk
+++ b/common/makefiles/Main.gmk
@@ -204,7 +204,7 @@
  # If the output directory was created by configure and now becomes 
empty, remove it as well.
  # FIXME: tmp should not be here, fix ResetTimers instead. And remove!
  dist-clean: clean
-    @($(CD) $(OUTPUT_ROOT) && $(RM) -r *spec.gmk config.* 
configure-arguments Makefile tmp)
+    @($(CD) $(OUTPUT_ROOT) && $(RM) -r *spec.gmk config.* 
configure-arguments Makefile tmp javacservers)
      @$(if $(filter $(CONF_NAME),$(notdir $(OUTPUT_ROOT))), \
      if test "x`$(LS) $(OUTPUT_ROOT)`" != x; then \
          $(ECHO) "Warning: Not removing non-empty configuration 
directory for '$(CONF_NAME)'" ;\

More information about the build-dev mailing list