diff options
author | Adrian Robert <Adrian.B.Robert@gmail.com> | 2008-07-15 18:15:18 +0000 |
---|---|---|
committer | Adrian Robert <Adrian.B.Robert@gmail.com> | 2008-07-15 18:15:18 +0000 |
commit | edfda78355c5528eee489fa8a7f9c73bf8e734f2 (patch) | |
tree | 78d2414d9791e1efc17ec9b35b438ae35602340a /Makefile.in | |
parent | 1391cd548782097e34d7856ec4f20ca90bdf2c26 (diff) | |
download | emacs-edfda78355c5528eee489fa8a7f9c73bf8e734f2.tar.gz |
merging Emacs.app (NeXTstep port)
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index 8e826394d43..3d550db8768 100644 --- a/Makefile.in +++ b/Makefile.in @@ -137,7 +137,7 @@ man1dir=$(mandir)/man1 infodir=@infodir@ INFO_FILES=ada-mode autotype calc ccmode cl dbus dired-x ebrowse ediff \ efaq eintr elisp emacs emacs-mime epa erc eshell eudc \ - flymake forms gnus idlwave info message mh-e newsticker \ + flymake forms gnus idlwave info message mh-e newsticker ns-emacs \ nxml-mode org pcl-cvs pgg rcirc reftex remember sasl sc ses \ sieve speedbar tramp vip viper widget woman smtpmail url @@ -167,6 +167,9 @@ x_default_search_path=@x_default_search_path@ # Location to install Emacs.app on Mac OS X carbon_appdir=@carbon_appdir@ +# Location to install Emacs.app under NeXT/Open/GNUstep / Cocoa +ns_appdir=@ns_appdir@ + # Where the etc/emacs.desktop file is to be installed. desktopdir=$(datarootdir)/applications @@ -411,6 +414,14 @@ install-arch-dep: mkdir (cd $(DESTDIR)${carbon_appdir}/Emacs.app; umask 022; tar -xvf - \ && cat > /dev/null))) || exit 1; \ fi + if test "${ns_appdir}" != ""; then \ + umask 022; mkdir -p ${ns_appdir}/Emacs.app; \ + (cd nextstep/build/Emacs.app; (tar -chf - . | \ + (cd ${ns_appdir}/Emacs.app; umask 022; tar -xvf - \ + && cat > /dev/null))) || exit 1; \ + ( cd site-lisp ; tar chf - . ) | \ + ( cd ${datadir}/$(EMACSFULL)/site-lisp ; tar xf - ) \ + fi ## http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg01672.html ## Needs to be the user running install, so configure can't set it. |