From: Glenn Morris <rgm@gnu.org>
Date: Sat, 12 May 2012 18:10:37 +0000 (-0700)
Subject: Remove trailing / from $ns_appbindir
X-Git-Tag: emacs-24.2.90~471^2~103
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9e6b06ed73b88a89ba1e31aaf8f3f7afe20f6cdd;p=emacs.git

Remove trailing / from $ns_appbindir

* configure.in (ns_appbindir): Remove trailing "/".
* src/ns.mk: Update for ns_appbindir no longer having trailing "/".
---

diff --git a/ChangeLog b/ChangeLog
index 7599d2b38be..b4b7bdb9f10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2012-05-12  Glenn Morris  <rgm@gnu.org>
 
+	* configure.in (ns_appbindir): Remove trailing "/".
+
 	* configure.in (AC_PROG_MKDIR_P): Call it, to set MKDIR_P.
 	(MKDEPDIR): Use $MKDIR_P.
 	* Makefile.in (MKDIR_P): New, set by configure.
diff --git a/configure.in b/configure.in
index 0ee180633e6..46909d75f9e 100644
--- a/configure.in
+++ b/configure.in
@@ -1568,20 +1568,17 @@ CPPFLAGS="$CPPFLAGS -x objective-c"
 CFLAGS="$CFLAGS -x objective-c"
 TEMACS_LDFLAGS2="\${LDFLAGS}"
 GNU_OBJC_CFLAGS=
-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=${ns_appdir}/Contents/MacOS/
+     ns_appbindir=${ns_appdir}/Contents/MacOS
      ns_appresdir=${ns_appdir}/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=${ns_appdir}/
+     ns_appbindir=${ns_appdir}
      ns_appresdir=${ns_appdir}/Resources
      ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base
      dnl FIXME sourcing this several times in subshells seems inefficient.
diff --git a/src/ChangeLog b/src/ChangeLog
index 63eae11cd45..c5083cd6e46 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-12  Glenn Morris  <rgm@gnu.org>
+
+	* ns.mk: Update for ns_appbindir no longer having trailing "/".
+
 2012-05-12  Eli Zaretskii  <eliz@gnu.org>
 
 	* lisp.mk (lisp): Add newcomment.elc.
diff --git a/src/ns.mk b/src/ns.mk
index bdfee61bd0a..77fbf5845d9 100644
--- a/src/ns.mk
+++ b/src/ns.mk
@@ -30,10 +30,10 @@ ${ns_appdir}: ${ns_appsrc}
 	${MKDIR_P} ${ns_appdir}
 	( cd ${ns_appsrc} ; tar cfh - . ) | ( cd ${ns_appdir} ; umask 022; tar xf - )
 
-${ns_appbindir}Emacs: emacs${EXEEXT}
+${ns_appbindir}/Emacs: emacs${EXEEXT}
 	${MKDIR_P} ${ns_appbindir}
-	cp -f emacs${EXEEXT} ${ns_appbindir}Emacs
+	cp -f emacs${EXEEXT} ${ns_appbindir}/Emacs
 
-ns-app: ${ns_appdir} ${ns_appbindir}Emacs
+ns-app: ${ns_appdir} ${ns_appbindir}/Emacs
 
 ### ns.mk ends here