diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-05-16 22:32:37 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-05-16 22:32:37 -0700 |
| commit | b4a3620021f85b50a24a739a55f85fc8cc876be7 (patch) | |
| tree | 99f3b45bb86f379ab35f2587d01ae911621c1142 | |
| parent | 96182ae6973a088e7c3fffd489acf626d0b3a6cb (diff) | |
| download | emacs-b4a3620021f85b50a24a739a55f85fc8cc876be7.tar.gz emacs-b4a3620021f85b50a24a739a55f85fc8cc876be7.tar.bz2 emacs-b4a3620021f85b50a24a739a55f85fc8cc876be7.zip | |
Fix previous change, for NS builds that are not self-contained
* configure.in (ns_self_contained): New output variable.
* Makefile.in (ns_self_contained): New, set by configure.
(install-arch-dep): Use $ns_self_contained.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Makefile.in | 6 | ||||
| -rw-r--r-- | configure.in | 3 |
3 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index e30635140ef..7f12e3ea69d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ 2012-05-17 Glenn Morris <rgm@gnu.org> - * Makefile.in (install-arch-dep): For a self-contained ns build, + * configure.in (ns_self_contained): New output variable. + * Makefile.in (ns_self_contained): New, set by configure. + (install-arch-dep): For a self-contained ns build, don't bother installing binaries then immediately deleting them. * Makefile.in (ns_appbindir, ns_appresdir): diff --git a/Makefile.in b/Makefile.in index e9ab4e6733d..53e73370b74 100644 --- a/Makefile.in +++ b/Makefile.in @@ -94,6 +94,8 @@ configuration=@configuration@ # Later values may use these. ns_appbindir=@ns_appbindir@ ns_appresdir=@ns_appresdir@ +# Either yes or no depending on whether this is a relocatable Emacs.app. +ns_self_contained=@ns_self_contained@ # The default location for installation. Everything is placed in # subdirectories of this directory. The default values for many of @@ -465,13 +467,13 @@ install-arch-dep: mkdir exec_prefix=${exec_prefix} bindir=${bindir} \ libexecdir=${libexecdir} archlibdir=${archlibdir} \ INSTALL_STRIP=${INSTALL_STRIP}) - if test "${ns_appresdir}" = ""; then \ + if test "${ns_self_contained}" = "no"; then \ ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} $(DESTDIR)${bindir}/$(EMACSFULL) || exit 1 ; \ chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL) ; \ rm -f $(DESTDIR)${bindir}/$(EMACS) ; \ ln $(DESTDIR)${bindir}/$(EMACSFULL) $(DESTDIR)${bindir}/$(EMACS) || true ; \ else \ - ( cd ${ns_appresdir} ; \ + ( cd ${ns_appresdir} || exit 1 ; \ if test -d share/emacs ; then \ for dir in share/emacs/${version}/*; do \ rm -fr `basename "$$dir"`; mv "$$dir" . ; \ diff --git a/configure.in b/configure.in index 8c3b3228241..048a8d7dec4 100644 --- a/configure.in +++ b/configure.in @@ -1574,6 +1574,7 @@ fi AC_SUBST(TEMACS_LDFLAGS2) LEIM_INSTALLDIR="\${install_prefix}/leim" +ns_self_contained=no ns_frag=/dev/null NS_OBJ= NS_OBJC_OBJ= @@ -1586,6 +1587,7 @@ if test "${HAVE_NS}" = yes; then with_xft=no # set up packaging dirs if test "${EN_NS_SELF_CONTAINED}" = yes; then + ns_self_contained=yes prefix=${ns_appresdir} exec_prefix=${ns_appbindir} dnl This one isn't really used, only archlibdir is. @@ -1600,6 +1602,7 @@ fi CFLAGS="$tmp_CFLAGS" CPPFLAGS="$tmp_CPPFLAGS" AC_SUBST(LEIM_INSTALLDIR) +AC_SUBST(ns_self_contained) AC_SUBST(NS_OBJ) AC_SUBST(NS_OBJC_OBJ) AC_SUBST(LIB_STANDARD) |