comparison 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
comparison
equal deleted inserted replaced
96674:ff312a846b25 96675:d45acf0c8d23
135 # since there are now many packages documented with the texinfo 135 # since there are now many packages documented with the texinfo
136 # system, it is inappropriate to imply that it is part of Emacs. 136 # system, it is inappropriate to imply that it is part of Emacs.
137 infodir=@infodir@ 137 infodir=@infodir@
138 INFO_FILES=ada-mode autotype calc ccmode cl dbus dired-x ebrowse ediff \ 138 INFO_FILES=ada-mode autotype calc ccmode cl dbus dired-x ebrowse ediff \
139 efaq eintr elisp emacs emacs-mime epa erc eshell eudc \ 139 efaq eintr elisp emacs emacs-mime epa erc eshell eudc \
140 flymake forms gnus idlwave info message mh-e newsticker \ 140 flymake forms gnus idlwave info message mh-e newsticker ns-emacs \
141 nxml-mode org pcl-cvs pgg rcirc reftex remember sasl sc ses \ 141 nxml-mode org pcl-cvs pgg rcirc reftex remember sasl sc ses \
142 sieve speedbar tramp vip viper widget woman smtpmail url 142 sieve speedbar tramp vip viper widget woman smtpmail url
143 143
144 # Directory for local state files for all programs. 144 # Directory for local state files for all programs.
145 localstatedir=@localstatedir@ 145 localstatedir=@localstatedir@
164 # Where to find the application default. 164 # Where to find the application default.
165 x_default_search_path=@x_default_search_path@ 165 x_default_search_path=@x_default_search_path@
166 166
167 # Location to install Emacs.app on Mac OS X 167 # Location to install Emacs.app on Mac OS X
168 carbon_appdir=@carbon_appdir@ 168 carbon_appdir=@carbon_appdir@
169
170 # Location to install Emacs.app under NeXT/Open/GNUstep / Cocoa
171 ns_appdir=@ns_appdir@
169 172
170 # Where the etc/emacs.desktop file is to be installed. 173 # Where the etc/emacs.desktop file is to be installed.
171 desktopdir=$(datarootdir)/applications 174 desktopdir=$(datarootdir)/applications
172 175
173 # Where the etc/images/icons/hicolor directory is to be installed. 176 # Where the etc/images/icons/hicolor directory is to be installed.
408 if test "${carbon_appdir}" != ""; then \ 411 if test "${carbon_appdir}" != ""; then \
409 umask 022; mkdir -p $(DESTDIR)${carbon_appdir}/Emacs.app; \ 412 umask 022; mkdir -p $(DESTDIR)${carbon_appdir}/Emacs.app; \
410 (cd mac/Emacs.app; (tar -chf - . | \ 413 (cd mac/Emacs.app; (tar -chf - . | \
411 (cd $(DESTDIR)${carbon_appdir}/Emacs.app; umask 022; tar -xvf - \ 414 (cd $(DESTDIR)${carbon_appdir}/Emacs.app; umask 022; tar -xvf - \
412 && cat > /dev/null))) || exit 1; \ 415 && cat > /dev/null))) || exit 1; \
416 fi
417 if test "${ns_appdir}" != ""; then \
418 umask 022; mkdir -p ${ns_appdir}/Emacs.app; \
419 (cd nextstep/build/Emacs.app; (tar -chf - . | \
420 (cd ${ns_appdir}/Emacs.app; umask 022; tar -xvf - \
421 && cat > /dev/null))) || exit 1; \
422 ( cd site-lisp ; tar chf - . ) | \
423 ( cd ${datadir}/$(EMACSFULL)/site-lisp ; tar xf - ) \
413 fi 424 fi
414 425
415 ## http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg01672.html 426 ## http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg01672.html
416 ## Needs to be the user running install, so configure can't set it. 427 ## Needs to be the user running install, so configure can't set it.
417 set_installuser=for installuser in $${LOGNAME} $${USERNAME} $${USER} \ 428 set_installuser=for installuser in $${LOGNAME} $${USERNAME} $${USER} \