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 "/".

diff --git a/ChangeLog b/ChangeLog
index 8634246bf41a3f858b0a86a36636b33a7b87c4c6..adfdd63bc98145a42631eba692bbddce47bf04a8 100644 (file)
--- 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 798b128fb44150a77998118e07b92c8f715ceef1..775c591af26fa7ac54b2f3df039208e0bdec78ac 100644 (file)
--- 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 28846991ae5518085ccf465935a18b401b240d20..a3ce499e7499838e59b259e3678131a3c6458eb2 100644 (file)
--- 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 d731dd88a5c0156742b1c4d2a978e4a88819d12b..81c0ba747ccf4f1c29f7a16353a290bd617e70a2 100644 (file)
--- 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 fdb3976b940a95beaf75a51915451f564478bdbf..b6a0e150cb1c7061a726c443a9e10c16f66d5d6a 100644 (file)
--- 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@