From da53fab92286d98b5a474ce9a5000f7f7ddf8c1c Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Sun, 16 May 2010 16:31:05 -0700
Subject: [PATCH] Tweak ns_app*dir values set by configure.

* configure.in (ns_appdir, ns_appbindir): Add trailing "/" to value.
* Makefile.in (install-arch-dep): Update for above change.

* src/Makefile.in (ns_appdir, ns_appbindir): Now configure adds the
trailing "/".
---
 ChangeLog       |  3 +++
 Makefile.in     |  4 ++--
 configure.in    | 11 +++++++----
 src/ChangeLog   |  3 +++
 src/Makefile.in |  4 ++--
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8634246bf41..adfdd63bc98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-05-16  Glenn Morris  <rgm@gnu.org>
 
+	* configure.in (ns_appdir, ns_appbindir): Add trailing "/" to value.
+	* Makefile.in (install-arch-dep): Update for above change.
+
 	* Makefile.in (ns_appdir): Remove.
 	(install-arch-dep): Test $ns_appresdir instead of $ns_appdir.
 
diff --git a/Makefile.in b/Makefile.in
index 798b128fb44..775c591af26 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -422,9 +422,9 @@ 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); \
+	  ( cd ${ns_appbindir}libexec ; dir=emacs/*/*/* ; $(MV_DIRS); \
 	    rm -fr emacs ) ; \
-	  ( cd ${ns_appbindir}/bin ; rm -f emacs emacs-24* ; \
+	  ( cd ${ns_appbindir}bin ; rm -f emacs emacs-24* ; \
 	    ln -sf ../libexec/* .) ; \
 	else true ; fi
 
diff --git a/configure.in b/configure.in
index 28846991ae5..a3ce499e749 100644
--- a/configure.in
+++ b/configure.in
@@ -1459,17 +1459,20 @@ tmp_CFLAGS="$CFLAGS"
 CPPFLAGS="$CPPFLAGS -x objective-c"
 CFLAGS="$CFLAGS -x objective-c"
 TEMACS_LDFLAGS2="\${LDFLAGS}"
+dnl I don't think it's especially important, but src/Makefile.in
+dnl (now the only user of ns_appdir) used to go to the trouble of adding a
+dnl trailing "/" to it, so now we do it here.
 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_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
   elif test -f $GNUSTEP_CONFIG_FILE; then
      NS_IMPL_GNUSTEP=yes
-     ns_appdir=`pwd`/nextstep/Emacs.app
-     ns_appbindir=`pwd`/nextstep/Emacs.app
+     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
      dnl FIXME sourcing this 3 times in subshells seems inefficient.
diff --git a/src/ChangeLog b/src/ChangeLog
index d731dd88a5c..81c0ba747cc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2010-05-16  Glenn Morris  <rgm@gnu.org>
 
+	* Makefile.in (ns_appdir, ns_appbindir): Now configure adds the
+	trailing "/".
+
 	* Makefile.in (TEMACS_LDFLAGS2): New, set by configure.
 	(temacs${EXEEXT}): Combine the NS_IMPL_GNUSTEP case with the default.
 
diff --git a/src/Makefile.in b/src/Makefile.in
index fdb3976b940..b6a0e150cb1 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -224,8 +224,8 @@ MSDOS_SUPPORT_REAL = ${lispsource}ls-lisp.elc ${lispsource}disp-table.elc \
 ## $MSDOS_SUPPORT_REAL if MSDOS.
 MSDOS_SUPPORT = 
 
-ns_appdir=@ns_appdir@/
-ns_appbindir=@ns_appbindir@/
+ns_appdir=@ns_appdir@
+ns_appbindir=@ns_appbindir@
 ns_appsrc=@ns_appsrc@
 NS_OBJ=@NS_OBJ@
 NS_SUPPORT=@NS_SUPPORT@
-- 
2.39.5