[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108212: Remove trailing / from $ns_appbindir

[Glenn Morris]

------------------------------------------------------------
revno: 108212
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2012-05-12 11:10:37 -0700
message:
  Remove trailing / from $ns_appbindir
  
  * configure.in (ns_appbindir): Remove trailing "/".
  * src/ns.mk: Update for ns_appbindir no longer having trailing "/".
modified:
  ChangeLog
  configure.in
  src/ChangeLog
  src/ns.mk

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-05-12 00:57:48 +0000
+++ b/ChangeLog 2012-05-12 18:10:37 +0000
@@ -1,5 +1,7 @@
 2012-05-12  Glenn Morris  <address@hidden>
 
+       * 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.

=== modified file 'configure.in'
--- a/configure.in      2012-05-12 00:57:48 +0000
+++ b/configure.in      2012-05-12 18:10:37 +0000
@@ -1568,20 +1568,17 @@
 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.

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-05-12 13:05:12 +0000
+++ b/src/ChangeLog     2012-05-12 18:10:37 +0000
@@ -1,3 +1,7 @@
+2012-05-12  Glenn Morris  <address@hidden>
+
+       * ns.mk: Update for ns_appbindir no longer having trailing "/".
+
 2012-05-12  Eli Zaretskii  <address@hidden>
 
        * lisp.mk (lisp): Add newcomment.elc.

=== modified file 'src/ns.mk'
--- a/src/ns.mk 2012-05-12 00:57:48 +0000
+++ b/src/ns.mk 2012-05-12 18:10:37 +0000
@@ -30,10 +30,10 @@
        ${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