From fe239e8e52c9aa8e0e23790b4a7a12a5da49625a Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Tue, 12 Oct 2010 14:03:09 -0700 Subject: [PATCH] Remove trailing / from directory names. * configure (ns_appdir, OLDXMENU, TOOLTIP_SUPPORT): Remove trailing / from directory names. --- ChangeLog | 5 +++++ configure | 18 +++++++++--------- configure.in | 18 +++++++++--------- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2f6b7c5147a..76efd274168 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-10-12 Dan Nicolaescu + + * configure (ns_appdir, OLDXMENU, TOOLTIP_SUPPORT): Remove + trailing / from directory names. + 2010-10-12 Glenn Morris * make-dist: Update and simplify. diff --git a/configure b/configure index 2db41ecf485..dcea52950b8 100755 --- a/configure +++ b/configure @@ -7679,15 +7679,15 @@ TEMACS_LDFLAGS2="\${LDFLAGS}" 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 @@ if test "${HAVE_NS}" = yes; then 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 @@ $as_echo "#define HAVE_X11 1" >>confdefs.h 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_WINDOW_SYSTEM 1" >>confdefs.h $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" && \ diff --git a/configure.in b/configure.in index 506732413ae..43c0513c22e 100644 --- a/configure.in +++ b/configure.in @@ -1491,15 +1491,15 @@ 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_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 @@ if test "${HAVE_NS}" = yes; then 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 @@ if test "${HAVE_X11}" = "yes" ; then 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 @@ if test "$HAVE_X_WINDOWS" = "yes" || test "$HAVE_NS" = "yes"; then 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" && \ -- 2.39.5