diff options
| author | Adrian Robert <Adrian.B.Robert@gmail.com> | 2008-07-17 17:44:41 +0000 |
|---|---|---|
| committer | Adrian Robert <Adrian.B.Robert@gmail.com> | 2008-07-17 17:44:41 +0000 |
| commit | 06b627700d30a166b0f06ad99166d448f9f7969c (patch) | |
| tree | 35b0b353bfd71222d337fafae846c1eee23ec1a7 /src/Makefile.in | |
| parent | e5744c66661fd4c5e118c0a9f451835543dcb789 (diff) | |
| download | emacs-06b627700d30a166b0f06ad99166d448f9f7969c.tar.gz | |
remove need for nextstep/compile for NS build; also, add NEWS entry about the port
Diffstat (limited to 'src/Makefile.in')
| -rw-r--r-- | src/Makefile.in | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index cba9dffddc8..93890de5669 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -532,17 +532,13 @@ emacsappsrc = ${srcdir}/../mac/Emacs.app/ #endif #ifdef HAVE_NS +ns_appdir=@ns_appdir@/ +ns_appbindir=@ns_appbindir@/ +ns_appresdir=@ns_appresdir@/ +ns_appsrc=@ns_appsrc@ /* Object files for NeXTstep */ NS_OBJ= nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o \ fontset.o fringe.o image.o -emacsapp = $(PWD)/../nextstep/build/Emacs.app/ -#ifdef NS_IMPL_GNUSTEP -emacsappsrc = ${srcdir}/../nextstep/GNUstep/Emacs.base -emacsbindir = $(emacsapp) -#else -emacsappsrc = ${srcdir}/../nextstep/Cocoa/Emacs.base -emacsbindir = $(emacsapp)/Contents/MacOS/ -#endif /* NS_IMPL_GNUSTEP */ #endif /* HAVE_NS */ #ifdef HAVE_WINDOW_SYSTEM @@ -1336,15 +1332,20 @@ nsselect.o: nsselect.m blockinput.h nsterm.h nsgui.h frame.h $(config_h) nsimage.o: nsimage.m nsterm.h nsfont.o: nsterm.h dispextern.h frame.h lisp.h $(config_h) -${emacsapp}: ${emacsappsrc} - mkdir -p ${emacsapp} - ( cd ${emacsappsrc} ; tar cfh - . ) | ( cd ${emacsapp} ; tar xf - ) +${ns_appdir}: ${ns_appsrc} + rm -fr ${ns_appdir} + mkdir -p ${ns_appdir} + ( cd ${ns_appsrc} ; tar cfh - . ) | ( cd ${ns_appdir} ; tar xf - ) + ( cd ${ns_appdir} ; for subdir in `find $${dest} -type d ! -name CVS -print` ; do \ + chmod a+rx $${subdir} ; \ + rm -rf $${subdir}/CVS ; \ + rm -f $${subdir}/.cvsignore ; done ; ) -${emacsbindir}Emacs: emacs${EXEEXT} - mkdir -p ${emacsbindir} - cp -f emacs${EXEEXT} ${emacsbindir}Emacs +${ns_appbindir}Emacs: emacs${EXEEXT} + mkdir -p ${ns_appbindir} + cp -f emacs${EXEEXT} ${ns_appbindir}Emacs -ns-app: ${emacsapp} ${emacsbindir}Emacs +ns-app: ${ns_appdir} ${ns_appbindir}Emacs #endif /* HAVE_NS */ |