From: Yuuki Harano <masm+github@masm11.me>
Date: Sun, 4 Jul 2021 13:37:03 +0000 (+0900)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk
X-Git-Tag: emacs-29.0.90~3681
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=492a0ae5927eda83b65dd08d3e1655a62fc2c43d;p=emacs.git

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

492a0ae5927eda83b65dd08d3e1655a62fc2c43d
diff --cc Makefile.in
index 2aba179b090,97d954b6ce5..24684e5d075
--- a/Makefile.in
+++ b/Makefile.in
@@@ -333,14 -333,12 +338,14 @@@ BIN_DESTDIR='$(DESTDIR)${bindir}/
  ELN_DESTDIR = $(DESTDIR)${libdir}/emacs/${version}/
  else
  BIN_DESTDIR='${ns_appbindir}/'
- ELN_DESTDIR = ${ns_appresdir}/
+ ELN_DESTDIR = ${ns_applibdir}/
  endif
  
 -all: ${SUBDIR} info
 +gsettings_SCHEMAS = etc/org.gnu.emacs.defaults.gschema.xml
 +
 +all: ${SUBDIR} info $(gsettings_SCHEMAS:.xml=.valid)
  
- .PHONY: all ${SUBDIR} blessmail epaths-force epaths-force-w32 etc-emacsver
+ .PHONY: all ${SUBDIR} blessmail epaths-force epaths-force-w32 epaths-force-ns-self-contained etc-emacsver
  
  # If configure were to just generate emacsver.tex from emacsver.tex.in
  # in the normal way, the timestamp of emacsver.tex would always be