From: Yuuki Harano <masm+github@masm11.me>
Date: Sun, 25 Apr 2021 06:30:05 +0000 (+0900)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk
X-Git-Tag: emacs-29.0.90~3712
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b302a551ab50a3d961f438380e9d095870c11a6c;p=emacs.git

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

b302a551ab50a3d961f438380e9d095870c11a6c
diff --cc Makefile.in
index 059ce1a8f7f,f04ba0c5c9d..64ad53abbf9
--- a/Makefile.in
+++ b/Makefile.in
@@@ -845,8 -838,7 +845,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
- 	$(MAKE) -C admin/charsets $@
  	[ ! -d test ] || $(MAKE) -C test $@
  	-rm -f ./*.tmp etc/*.tmp*
  	-rm -rf info-dir.*