diff options
| author | Paul Eggert | 2014-06-16 15:38:17 -0700 |
|---|---|---|
| committer | Paul Eggert | 2014-06-16 15:38:17 -0700 |
| commit | 64e104891f14070bccd1bae0b6da8f2d7091a3f1 (patch) | |
| tree | 5e144f731722b6168bd45032b1f191ab36333cf2 /src | |
| parent | e9558d441dfafa37efd85c5341b519adc6985319 (diff) | |
| download | emacs-64e104891f14070bccd1bae0b6da8f2d7091a3f1.tar.gz emacs-64e104891f14070bccd1bae0b6da8f2d7091a3f1.zip | |
* 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
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/Makefile.in | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a97cc3a2567..c2f0d27fd73 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2014-06-16 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * Makefile.in (ns-app): Fix typo that broke build on OS X. | ||
| 4 | Reported by David Caldwell in: | ||
| 5 | http://lists.gnu.org/archive/html/emacs-devel/2014-06/msg00251.html | ||
| 6 | |||
| 1 | 2014-06-16 Dmitry Antipov <dmantipov@yandex.ru> | 7 | 2014-06-16 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 8 | ||
| 3 | Do not ask for XRender extension each time XFT font is opened. | 9 | 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 \ | |||
| 519 | -o $@ $(ntsource)/emacs.rc | 519 | -o $@ $(ntsource)/emacs.rc |
| 520 | 520 | ||
| 521 | ns-app: emacs$(EXEEXT) | 521 | ns-app: emacs$(EXEEXT) |
| 522 | $(MAKE) -C ./nextstep all | 522 | $(MAKE) -C ../nextstep all |
| 523 | 523 | ||
| 524 | .PHONY: mostlyclean clean bootstrap-clean distclean maintainer-clean | 524 | .PHONY: mostlyclean clean bootstrap-clean distclean maintainer-clean |
| 525 | .PHONY: versionclean extraclean | 525 | .PHONY: versionclean extraclean |