[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r101938: Remove trailing / from direc
From: |
Dan Nicolaescu |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r101938: Remove trailing / from directory names. |
Date: |
Tue, 12 Oct 2010 14:03:09 -0700 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 101938
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Tue 2010-10-12 14:03:09 -0700
message:
Remove trailing / from directory names.
* configure (ns_appdir, OLDXMENU, TOOLTIP_SUPPORT): Remove
trailing / from directory names.
modified:
ChangeLog
configure
configure.in
=== modified file 'ChangeLog'
--- a/ChangeLog 2010-10-12 04:32:20 +0000
+++ b/ChangeLog 2010-10-12 21:03:09 +0000
@@ -1,3 +1,8 @@
+2010-10-12 Dan Nicolaescu <address@hidden>
+
+ * configure (ns_appdir, OLDXMENU, TOOLTIP_SUPPORT): Remove
+ trailing / from directory names.
+
2010-10-12 Glenn Morris <address@hidden>
* make-dist: Update and simplify.
=== modified file 'configure'
--- a/configure 2010-10-10 15:35:04 +0000
+++ b/configure 2010-10-12 21:03:09 +0000
@@ -7679,15 +7679,15 @@
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_appresdir=${ns_appdir}Contents/Resources
+ ns_appdir=`pwd`/nextstep/Emacs.app
+ 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_appdir=`pwd`/nextstep/Emacs.app
ns_appbindir=${ns_appdir}
- ns_appresdir=${ns_appdir}Resources
+ ns_appresdir=${ns_appdir}/Resources
ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base
GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo
$GNUSTEP_SYSTEM_HEADERS)"
GNUSTEP_SYSTEM_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo
$GNUSTEP_SYSTEM_LIBRARIES)"
@@ -7751,7 +7751,7 @@
fi
ns_frag=$srcdir/src/ns.mk
NS_OBJ="nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o fontset.o
fringe.o image.o"
- NS_SUPPORT="\${lispsource}emacs-lisp/easymenu.elc
\${lispsource}term/ns-win.elc"
+ NS_SUPPORT="\${lispsource}/emacs-lisp/easymenu.elc
\${lispsource}/term/ns-win.elc"
fi
CFLAGS="$tmp_CFLAGS"
CPPFLAGS="$tmp_CPPFLAGS"
@@ -14696,9 +14696,9 @@
if test "$USE_X_TOOLKIT" = "none"; then
- OLDXMENU="\${oldXMenudir}libXMenu11.a"
+ OLDXMENU="\${oldXMenudir}/libXMenu11.a"
else
- OLDXMENU="\${lwlibdir}liblw.a"
+ OLDXMENU="\${lwlibdir}/liblw.a"
fi
LIBXMENU="\$(OLDXMENU)"
LIBX_OTHER="\$(LIBXT) \$(LIBX_EXTRA)"
@@ -14909,7 +14909,7 @@
$as_echo "#define HAVE_MOUSE 1" >>confdefs.h
MOUSE_SUPPORT="\$(REAL_MOUSE_SUPPORT)"
- TOOLTIP_SUPPORT="\${lispsource}mouse.elc"
+ TOOLTIP_SUPPORT="\${lispsource}/mouse.elc"
WINDOW_SUPPORT="\$(BASE_WINDOW_SUPPORT)"
test "$HAVE_X_WINDOWS" = "yes" && \
=== modified file 'configure.in'
--- a/configure.in 2010-10-10 15:35:04 +0000
+++ b/configure.in 2010-10-12 21:03:09 +0000
@@ -1491,15 +1491,15 @@
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_appresdir=${ns_appdir}Contents/Resources
+ ns_appdir=`pwd`/nextstep/Emacs.app
+ 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_appdir=`pwd`/nextstep/Emacs.app
ns_appbindir=${ns_appdir}
- ns_appresdir=${ns_appdir}Resources
+ ns_appresdir=${ns_appdir}/Resources
ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base
dnl FIXME sourcing this several times in subshells seems inefficient.
GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo
$GNUSTEP_SYSTEM_HEADERS)"
@@ -1546,7 +1546,7 @@
fi
ns_frag=$srcdir/src/ns.mk
NS_OBJ="nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o fontset.o
fringe.o image.o"
- NS_SUPPORT="\${lispsource}emacs-lisp/easymenu.elc
\${lispsource}term/ns-win.elc"
+ NS_SUPPORT="\${lispsource}/emacs-lisp/easymenu.elc
\${lispsource}/term/ns-win.elc"
fi
CFLAGS="$tmp_CFLAGS"
CPPFLAGS="$tmp_CPPFLAGS"
@@ -3260,9 +3260,9 @@
Otherwise, Emacs expects to use version 10.])
if test "$USE_X_TOOLKIT" = "none"; then
- OLDXMENU="\${oldXMenudir}libXMenu11.a"
+ OLDXMENU="\${oldXMenudir}/libXMenu11.a"
else
- OLDXMENU="\${lwlibdir}liblw.a"
+ OLDXMENU="\${lwlibdir}/liblw.a"
fi
LIBXMENU="\$(OLDXMENU)"
LIBX_OTHER="\$(LIBXT) \$(LIBX_EXTRA)"
@@ -3468,7 +3468,7 @@
AC_DEFINE(HAVE_WINDOW_SYSTEM, 1, [Define if you have a window system.])
AC_DEFINE(HAVE_MOUSE, 1, [Define if you have mouse support.])
MOUSE_SUPPORT="\$(REAL_MOUSE_SUPPORT)"
- TOOLTIP_SUPPORT="\${lispsource}mouse.elc"
+ TOOLTIP_SUPPORT="\${lispsource}/mouse.elc"
WINDOW_SUPPORT="\$(BASE_WINDOW_SUPPORT)"
test "$HAVE_X_WINDOWS" = "yes" && \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r101938: Remove trailing / from directory names.,
Dan Nicolaescu <=