From 64e104891f14070bccd1bae0b6da8f2d7091a3f1 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 16 Jun 2014 15:38:17 -0700 Subject: [PATCH] * Makefile.in (ns-app): Fix typo that broke build on OS X. Reported by David Caldwell in: http://lists.gnu.org/archive/html/emacs-devel/2014-06/msg00251.html --- src/ChangeLog | 6 ++++++ src/Makefile.in | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index a97cc3a2567..c2f0d27fd73 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2014-06-16 Paul Eggert + + * Makefile.in (ns-app): Fix typo that broke build on OS X. + Reported by David Caldwell in: + http://lists.gnu.org/archive/html/emacs-devel/2014-06/msg00251.html + 2014-06-16 Dmitry Antipov Do not ask for XRender extension each time XFT font is opened. diff --git a/src/Makefile.in b/src/Makefile.in index 64c6b72479b..5bed189f16a 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -519,7 +519,7 @@ emacs.res: $(ntsource)/emacs.rc \ -o $@ $(ntsource)/emacs.rc ns-app: emacs$(EXEEXT) - $(MAKE) -C ./nextstep all + $(MAKE) -C ../nextstep all .PHONY: mostlyclean clean bootstrap-clean distclean maintainer-clean .PHONY: versionclean extraclean -- 2.11.4.GIT