emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] Changes to emacs/Makefile.in,v


From: Adrian Robert
Subject: [Emacs-diffs] Changes to emacs/Makefile.in,v
Date: Thu, 17 Jul 2008 17:44:42 +0000

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Adrian Robert <arobert> 08/07/17 17:44:41

Index: Makefile.in
===================================================================
RCS file: /sources/emacs/emacs/Makefile.in,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -b -r1.357 -r1.358
--- Makefile.in 15 Jul 2008 18:14:52 -0000      1.357
+++ Makefile.in 17 Jul 2008 17:44:36 -0000      1.358
@@ -169,6 +169,8 @@
 
 # Location to install Emacs.app under NeXT/Open/GNUstep / Cocoa
 address@hidden@
address@hidden@
address@hidden@
 
 # Where the etc/emacs.desktop file is to be installed.
 desktopdir=$(datarootdir)/applications
@@ -415,13 +417,14 @@
                        && 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.




reply via email to

[Prev in Thread] Current Thread [Next in Thread]