summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorAdrian Robert <Adrian.B.Robert@gmail.com>2008-07-17 17:44:41 +0000
committerAdrian Robert <Adrian.B.Robert@gmail.com>2008-07-17 17:44:41 +0000
commit06b627700d30a166b0f06ad99166d448f9f7969c (patch)
tree35b0b353bfd71222d337fafae846c1eee23ec1a7 /Makefile.in
parente5744c66661fd4c5e118c0a9f451835543dcb789 (diff)
downloademacs-06b627700d30a166b0f06ad99166d448f9f7969c.tar.gz
remove need for nextstep/compile for NS build; also, add NEWS entry about the port
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in17
1 files changed, 10 insertions, 7 deletions
diff --git a/Makefile.in b/Makefile.in
index 3d550db8768..c5cd80b9d30 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -169,6 +169,8 @@ carbon_appdir=@carbon_appdir@
# Location to install Emacs.app under NeXT/Open/GNUstep / Cocoa
ns_appdir=@ns_appdir@
+ns_appbindir=@ns_appbindir@
+ns_appresdir=@ns_appresdir@
# Where the etc/emacs.desktop file is to be installed.
desktopdir=$(datarootdir)/applications
@@ -415,13 +417,14 @@ install-arch-dep: mkdir
&& 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
+ ( cd ${ns_appresdir} ; \
+ if test -d share/emacs ; then mv -f share/emacs/*/* . ; fi ; \
+ if test -d info ; then mv -f share/info . ; fi ; \
+ rm -fr share ) ; \
+ ( cd ${ns_appbindir}/libexec ; mv -f emacs/*/*/* . ; rm -fr emacs ) ; \
+ ( cd ${ns_appbindir}/bin ; rm -f emacs emacs-23* ; \
+ ln -sf ../libexec/* .) ; \
+ else true ; 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.