[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108255: Install a self-contained
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108255: Install a self-contained NS build's libexec directly into the right place |
Date: |
Fri, 02 Nov 2012 01:54:09 -0000 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 108255
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2012-05-16 21:23:03 -0400
message:
Install a self-contained NS build's libexec directly into the right place
This is rather than installing it in one place then moving it.
* configure.in (archlibdir): Set it for self-contained ns builds.
(libexecdir): Don't expand it now (this is mainly cosmetic).
* Makefile.in (ns_appbindir, ns_appresdir):
Move them before things that may refer to them.
(install-arch-dep): No need to relocate self-contained ns libexec.
* lib-src/Makefile.in (ns_appbindir): New, set by configure.
modified:
ChangeLog
Makefile.in
configure.in
lib-src/ChangeLog
lib-src/Makefile.in
=== modified file 'ChangeLog'
--- a/ChangeLog 2012-05-16 09:01:55 +0000
+++ b/ChangeLog 2012-05-17 01:23:03 +0000
@@ -1,3 +1,12 @@
+2012-05-17 Glenn Morris <address@hidden>
+
+ * Makefile.in (ns_appbindir, ns_appresdir):
+ Move them before things that may refer to them.
+ (install-arch-dep): No need to relocate self-contained ns libexec.
+
+ * configure.in (archlibdir): Set it for self-contained ns builds.
+ (libexecdir): Don't expand it now (this is mainly cosmetic).
+
2012-05-16 Paul Eggert <address@hidden>
* configure.in: Simplify by removing CPP etc.
=== modified file 'Makefile.in'
--- a/Makefile.in 2012-05-15 19:17:24 +0000
+++ b/Makefile.in 2012-05-17 01:23:03 +0000
@@ -90,6 +90,11 @@
# ==================== Where To Install Things ====================
+# Location to install Emacs.app under GNUstep / Mac OS X.
+# Later values may use these.
address@hidden@
address@hidden@
+
# The default location for installation. Everything is placed in
# subdirectories of this directory. The default values for many of
# the variables below are expressed in terms of this one, so you may
@@ -117,8 +122,10 @@
address@hidden@
# Where to install and expect executable files to be run by Emacs
-# rather than directly by users, and other architecture-dependent
-# data. ${archlibdir} is a subdirectory of this.
+# rather than directly by users (and other architecture-dependent
+# data, although Emacs does not have any). The executables
+# are actually installed in ${archlibdir}, which is (normally)
+# a subdirectory of this.
address@hidden@
# Where to install Emacs's man pages.
@@ -158,10 +165,6 @@
# Where to find the application default.
address@hidden@
-# Location to install Emacs.app under NeXT/Open/GNUstep / Cocoa
address@hidden@
address@hidden@
-
# Where the etc/emacs.desktop file is to be installed.
desktopdir=$(datarootdir)/applications
@@ -475,10 +478,7 @@
fi ; \
if test -d share/info ; then rm -fr info; mv share/info . ; fi ; \
rm -fr share ) ; \
- ( if cd ${ns_appbindir}/libexec ; then \
- mv -f emacs/${version}/${configuration}/* . ; rm -fr emacs ; \
- rm -f ../bin/emacs ../bin/$(EMACSFULL) ; \
- fi ) ; \
+ rm -f ${ns_appbindir}/bin/emacs ${ns_appbindir}/bin/$(EMACSFULL); \
else true ; fi
## FIXME NS self-contained: rather than installing emacs and
=== modified file 'configure.in'
--- a/configure.in 2012-05-16 09:01:55 +0000
+++ b/configure.in 2012-05-17 01:23:03 +0000
@@ -1588,7 +1588,9 @@
if test "${EN_NS_SELF_CONTAINED}" = yes; then
prefix=${ns_appresdir}
exec_prefix=${ns_appbindir}
- libexecdir=${ns_appbindir}/libexec
+ dnl This one isn't really used, only archlibdir is.
+ libexecdir="\${ns_appbindir}/libexec"
+ archlibdir="\${ns_appbindir}/libexec"
LEIM_INSTALLDIR="\${ns_appresdir}/leim"
fi
ns_frag=$srcdir/src/ns.mk
=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2012-05-12 01:19:47 +0000
+++ b/lib-src/ChangeLog 2012-05-17 01:23:03 +0000
@@ -1,3 +1,7 @@
+2012-05-17 Glenn Morris <address@hidden>
+
+ * Makefile.in (ns_appbindir): New, set by configure.
+
2012-05-12 Glenn Morris <address@hidden>
* Makefile.in (MKDIR_P): New, set by configure.
=== modified file 'lib-src/Makefile.in'
--- a/lib-src/Makefile.in 2012-05-12 01:19:47 +0000
+++ b/lib-src/Makefile.in 2012-05-17 01:23:03 +0000
@@ -45,6 +45,10 @@
# ==================== Where To Install Things ====================
+# Location to install Emacs.app under GNUstep / Mac OS X.
+# Later values may use this.
address@hidden@
+
# The default location for installation. Everything is placed in
# subdirectories of this directory. The default values for many of
# the variables below are expressed in terms of this one, so you may
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/emacs-24 r108255: Install a self-contained NS build's libexec directly into the right place,
Glenn Morris <=