diff options
Diffstat (limited to 'nextstep')
| -rw-r--r-- | nextstep/ChangeLog | 15 | ||||
| -rw-r--r-- | nextstep/INSTALL | 10 | ||||
| -rw-r--r-- | nextstep/Makefile.in | 13 | ||||
| -rw-r--r-- | nextstep/README | 37 |
4 files changed, 34 insertions, 41 deletions
diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog index 04d24bff390..110b21372d4 100644 --- a/nextstep/ChangeLog +++ b/nextstep/ChangeLog @@ -1,6 +1,19 @@ 2014-10-20 Glenn Morris <rgm@gnu.org> - * Version 24.4 released. + * Merge in all changes up to 24.4 release. + +2014-10-12 Paul Eggert <eggert@cs.ucla.edu> + + * README: Mac OS X 10.6 or later now required. + +2014-06-25 Glenn Morris <rgm@gnu.org> + + * Makefile.in (${ns_appbindir}): New. + (${ns_appbindir}/Emacs): Use order-only prereq to create output dir. + +2014-06-15 Glenn Morris <rgm@gnu.org> + + * Makefile.in (bootstrap-clean): New. 2014-03-13 Glenn Morris <rgm@gnu.org> diff --git a/nextstep/INSTALL b/nextstep/INSTALL index 63f52efdca9..76cc01c5831 100644 --- a/nextstep/INSTALL +++ b/nextstep/INSTALL @@ -2,6 +2,16 @@ Copyright (C) 2008-2014 Free Software Foundation, Inc. See the end of the file for license conditions. +Requirements +------------ +Mac OS X 10.6 or later + +- or - + +GNUstep "Startup 0.23" or later +Tested on GNU/Linux, may work on other systems. + + Compilation ----------- diff --git a/nextstep/Makefile.in b/nextstep/Makefile.in index fe570d13ee8..52f321109b7 100644 --- a/nextstep/Makefile.in +++ b/nextstep/Makefile.in @@ -43,16 +43,19 @@ ${ns_check_file} ${ns_appdir}: ${srcdir}/${ns_appsrc} ${ns_appsrc} ( cd ${ns_appdir} ; umask 022; tar xf - ) touch ${ns_appdir} -${ns_appbindir}/Emacs: ${ns_appdir} ${ns_check_file} ../src/emacs${EXEEXT} - ${MKDIR_P} ${ns_appbindir} - cp -f ../src/emacs${EXEEXT} ${ns_appbindir}/Emacs +${ns_appbindir}: + ${MKDIR_P} $@ + +${ns_appbindir}/Emacs: ${ns_appdir} ${ns_check_file} ../src/emacs${EXEEXT} | \ + ${ns_appbindir} + cp -f ../src/emacs${EXEEXT} $@ .PHONY: all all: ${ns_appdir} ${ns_appbindir}/Emacs -.PHONY: clean distclean maintainer-clean +.PHONY: clean distclean bootstrap-clean maintainer-clean clean: rm -rf ${ns_appdir} @@ -64,6 +67,6 @@ distclean: clean Cocoa/Emacs.base/Contents/Info.plist \ Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings -maintainer-clean: distclean +bootstrap-clean maintainer-clean: distclean ### Makefile.in ends here diff --git a/nextstep/README b/nextstep/README index fdfa15ffd9d..45b9b23ee10 100644 --- a/nextstep/README +++ b/nextstep/README @@ -1,37 +1,4 @@ -Copyright (C) 2008-2014 Free Software Foundation, Inc. -See the end of the file for license conditions. - -This directory contains the files needed to build Emacs on -Nextstep-based platforms, including GNUstep and Mac OS X. - -The Nextstep support code works on many POSIX systems (and possibly -W32) using the GNUstep libraries, and on MacOS X systems using the -Cocoa libraries. +This directory contains files needed to build Emacs on Nextstep-based +platforms, including GNUstep and Mac OS X (using the Cocoa libraries). See the INSTALL file in this directory for compilation instructions. - -Requirements ------------- -MacOS X 10.4 or later - -- or - - -GNUstep "Startup 0.23" or later -Tested on GNU/Linux, should work on other systems, perhaps with minor -build tweaking. - - -This file is part of GNU Emacs. - -GNU Emacs is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -GNU Emacs is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |