re PR go/89193 ("make distclean" leaves stuff in gotools/)

	PR go/89193
	* Makefile.am (mostlyclean-local): Avoid getting an error from
	chmod.  Remove check-vet-dir and gocache-test.
	* Makefile.in: Regenerate.

From-SVN: r268830

diff --git a/gotools/ChangeLog b/gotools/ChangeLog
index 7404c209e50180627101218cf3ad9fc2db4bb5fa..22ecd9a408380a6542e14b4b7ff12708000f1939 100644 (file)
--- a/gotools/ChangeLog
+++ b/gotools/ChangeLog
@@ -1,3 +1,10 @@
+2019-02-12  Ian Lance Taylor  <iant@golang.org>
+
+       PR go/89193
+       * Makefile.am (mostlyclean-local): Avoid getting an error from
+       chmod.  Remove check-vet-dir and gocache-test.
+       * Makefile.in: Regenerate.
+
 2019-01-28  Uroš Bizjak  <ubizjak@gmail.com>
 
        * Makefile.in: Really regenerate.

diff --git a/gotools/Makefile.am b/gotools/Makefile.am
index ad0ad24e206497762d1969eb1925db57baece002..2ade1d7f019e4941eb384fd7a33b14e4459c6f65 100644 (file)
--- a/gotools/Makefile.am
+++ b/gotools/Makefile.am
@@ -100,8 +100,9 @@ MOSTLYCLEANFILES = \
        *.sent
 
 mostlyclean-local:
-       -chmod -R u+w check-go-dir
-       rm -rf check-go-dir check-runtime-dir cgo-test-dir carchive-test-dir
+       if test -d check-go-dir; then chmod -R u+w check-go-dir; fi
+       rm -rf check-go-dir check-runtime-dir cgo-test-dir carchive-test-dir \
+       check-vet-dir gocache-test
 
 if NATIVE
 

diff --git a/gotools/Makefile.in b/gotools/Makefile.in
index 8bea35500bd8cb2562ccdb5cb5a14c47fc94039b..c591b709581f6b4d92d5f96485ea5fed76cbadcc 100644 (file)
--- a/gotools/Makefile.in
+++ b/gotools/Makefile.in
@@ -703,8 +703,8 @@ distclean-generic:
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
        @echo "it deletes files that may require special tools to rebuild."
-@NATIVE_FALSE@uninstall-local:
 @NATIVE_FALSE@install-exec-local:
+@NATIVE_FALSE@uninstall-local:
 clean: clean-am
 
 clean-am: clean-binPROGRAMS clean-generic clean-noinstPROGRAMS \
@@ -813,8 +813,9 @@ s-zdefaultcc: Makefile
        $(STAMP) $@ 
 
 mostlyclean-local:
-       -chmod -R u+w check-go-dir
-       rm -rf check-go-dir check-runtime-dir cgo-test-dir carchive-test-dir
+       if test -d check-go-dir; then chmod -R u+w check-go-dir; fi
+       rm -rf check-go-dir check-runtime-dir cgo-test-dir carchive-test-dir \
+       check-vet-dir gocache-test
 
 @NATIVE_TRUE@go$(EXEEXT): $(go_cmd_go_files) $(LIBGOTOOL) $(LIBGODEP)
 @NATIVE_TRUE@  $(GOLINK) $(go_cmd_go_files) $(LIBGOTOOL) $(LIBS) $(NET_LIBS)