[patch] alternative patch, intended for upstream

emacs-23.2-ns-appdirs.patch (text/plain), 1.75 KB, created by Ulrich Müller on 2011-01-03 18:27:09 UTC

--- emacs-23.2-orig/configure.in
+++ emacs-23.2/configure.in
@@ -1382,16 +1382,20 @@
 if test "${with_ns}" != no; then
   if test "${opsys}" = darwin; then
      NS_IMPL_COCOA=yes
-     ns_appdir=`pwd`/nextstep/Emacs.app
-     ns_appbindir=`pwd`/nextstep/Emacs.app/Contents/MacOS
-     ns_appresdir=`pwd`/nextstep/Emacs.app/Contents/Resources
-     ns_appsrc=${srcdir}/nextstep/Cocoa/Emacs.base
+     if test "${EN_NS_SELF_CONTAINED}" = yes; then
+        ns_appdir=`pwd`/nextstep/Emacs.app
+        ns_appbindir=`pwd`/nextstep/Emacs.app/Contents/MacOS
+        ns_appresdir=`pwd`/nextstep/Emacs.app/Contents/Resources
+        ns_appsrc=${srcdir}/nextstep/Cocoa/Emacs.base
+     fi
   elif test -f $GNUSTEP_CONFIG_FILE; then
      NS_IMPL_GNUSTEP=yes
-     ns_appdir=`pwd`/nextstep/Emacs.app
-     ns_appbindir=`pwd`/nextstep/Emacs.app
-     ns_appresdir=`pwd`/nextstep/Emacs.app/Resources
-     ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base
+     if test "${EN_NS_SELF_CONTAINED}" = yes; then
+        ns_appdir=`pwd`/nextstep/Emacs.app
+        ns_appbindir=`pwd`/nextstep/Emacs.app
+        ns_appresdir=`pwd`/nextstep/Emacs.app/Resources
+        ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base
+     fi
      dnl FIXME sourcing this 3 times in subshells seems inefficient.
      GNUSTEP_MAKEFILES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_MAKEFILES)"
      GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)"
@@ -1417,10 +1421,10 @@
   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
 fi
 CFLAGS="$tmp_CFLAGS"