[Emacs-diffs] /srv/bzr/emacs/trunk r100327: Tweak ns_app*dir values set by configure.

[Glenn Morris]

------------------------------------------------------------
revno: 100327
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2010-05-16 16:31:05 -0700
message:
  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 "/".
modified:
  ChangeLog
  Makefile.in
  configure.in
  src/ChangeLog
  src/Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2010-05-16 23:21:06 +0000
+++ b/ChangeLog 2010-05-16 23:31:05 +0000
@@ -1,5 +1,8 @@
 2010-05-16  Glenn Morris  <address@hidden>
 
+       * 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.
 

=== modified file 'Makefile.in'
--- a/Makefile.in       2010-05-16 23:21:06 +0000
+++ b/Makefile.in       2010-05-16 23:31:05 +0000
@@ -422,9 +422,9 @@
            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
 

=== modified file 'configure.in'
--- a/configure.in      2010-05-16 23:01:56 +0000
+++ b/configure.in      2010-05-16 23:31:05 +0000
@@ -1459,17 +1459,20 @@
 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.

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-05-16 23:01:56 +0000
+++ b/src/ChangeLog     2010-05-16 23:31:05 +0000
@@ -1,5 +1,8 @@
 2010-05-16  Glenn Morris  <address@hidden>
 
+       * 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.
 

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2010-05-16 23:01:56 +0000
+++ b/src/Makefile.in   2010-05-16 23:31:05 +0000
@@ -224,8 +224,8 @@
 ## $MSDOS_SUPPORT_REAL if MSDOS.
 MSDOS_SUPPORT = 
 
address@hidden@/
address@hidden@/
address@hidden@
address@hidden@
 address@hidden@
 address@hidden@
 address@hidden@