Mercurial > emacs
diff Makefile.in @ 96675:d45acf0c8d23
merging Emacs.app (NeXTstep port)
| author | Adrian Robert <Adrian.B.Robert@gmail.com> |
|---|---|
| date | Tue, 15 Jul 2008 18:15:18 +0000 |
| parents | 534958847ee0 |
| children | 2b46fd076f88 |
line wrap: on
line diff
--- a/Makefile.in Tue Jul 15 15:45:05 2008 +0000 +++ b/Makefile.in Tue Jul 15 18:15:18 2008 +0000 @@ -137,7 +137,7 @@ 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 @@ # 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 @@ (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.