From 816be9f6298874bd26a61c28a97be74ff2298d8d Mon Sep 17 00:00:00 2001
From: Yavor Doganov <yavor@gnu.org>
Date: Mon, 21 Nov 2011 20:37:45 -0500
Subject: [PATCH] Small fix for --disable-ns-self-contained builds

Do not install arch-dependent files in the app bundle if
--disable-ns-self-contained is requested.

* configure.in (exec_prefix, libexecdir): Define relative to
ns_appbindir' only if configured for a self-contained app.
* Makefile.in (install-arch-dep): Test for the existence of
libexec in the Emacs.app bundle before executing commands.

Fixes: debbugs:1335
---
 ChangeLog    | 9 +++++++++
 Makefile.in  | 8 ++++----
 configure.in | 4 ++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bccedc607ba..521d2ab8e00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-11-22  Yavor Doganov  <yavor@gnu.org>
+
+	Do not install arch-dependent files in the app bundle if
+	--disable-ns-self-contained is requested.  (Bug#1335)
+	* configure.in (exec_prefix, libexecdir): Define relative to
+	`ns_appbindir' only if configured for a self-contained app.
+	* Makefile.in (install-arch-dep): Test for the existence of
+	libexec in the Emacs.app bundle before executing commands.
+
 2011-11-20  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* configure.in: Remove reference to src/m/ibms390.h.
diff --git a/Makefile.in b/Makefile.in
index 47cba3f9070..1e86f5f0176 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -474,10 +474,10 @@ install-arch-dep: mkdir
 	    if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\
 	    if test -d share/info ; then dir=share/info; $(MV_DIRS) ; fi ; \
 	    rm -fr share ) ; \
-	  ( cd ${ns_appbindir}libexec ; dir=emacs/*/*/* ; $(MV_DIRS); \
-	    rm -fr emacs ) ; \
-	  ( cd ${ns_appbindir}bin ; rm -f emacs emacs-24* ; \
-	    ln -sf ../libexec/* .) ; \
+	  ( cd ${ns_appbindir} ; \
+	    if test -d libexec; then cd libexec ; dir=emacs/*/*/* ; \
+	    $(MV_DIRS); rm -fr emacs; \
+	    cd ../bin; rm -f emacs emacs-24*; ln -sf ../libexec/* . ; fi ) ; \
 	else true ; fi
 
 ## FIXME is the emacs-24* bit above really necessary and correct?
diff --git a/configure.in b/configure.in
index 204c0e650a7..3ff8962cef4 100644
--- a/configure.in
+++ b/configure.in
@@ -1568,10 +1568,10 @@ if test "${HAVE_NS}" = yes; then
   window_system=nextstep
   with_xft=no
   # set up packaging dirs
-  exec_prefix=${ns_appbindir}
-  libexecdir=${ns_appbindir}/libexec
   if test "${EN_NS_SELF_CONTAINED}" = yes; then
      prefix=${ns_appresdir}
+     exec_prefix=${ns_appbindir}
+     libexecdir=${ns_appbindir}/libexec
   fi
   ns_frag=$srcdir/src/ns.mk
   NS_OBJ="fontset.o fringe.o image.o"