From: Yuuki Harano <masm+github@masm11.me>
Date: Wed, 19 May 2021 13:02:06 +0000 (+0900)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk
X-Git-Tag: emacs-29.0.90~3698
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e48372f8e5722643e37185b004469acd174663f7;p=emacs.git

Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk
---

e48372f8e5722643e37185b004469acd174663f7
diff --cc Makefile.in
index 3115e63025f,65eceb2a0c9..71f761eb40f
--- a/Makefile.in
+++ b/Makefile.in
@@@ -869,8 -863,7 +870,7 @@@ clean_dirs = $(mostlyclean_dirs) nextst
  
  $(foreach dir,$(clean_dirs),$(eval $(call submake_template,$(dir),clean)))
  
 -clean: $(clean_dirs:=_clean)
 +clean: $(clean_dirs:=_clean) clean-gsettings-schemas
- 	[ ! -d test ] || $(MAKE) -C test $@
  	-rm -f ./*.tmp etc/*.tmp*
  	-rm -rf info-dir.*
  	-rm -rf native-lisp