diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2010-10-12 14:03:09 -0700 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2010-10-12 14:03:09 -0700 |
| commit | fe239e8e52c9aa8e0e23790b4a7a12a5da49625a (patch) | |
| tree | eadfa6c17fe30fc6f75e81691b548c3ec04cb6e3 /configure | |
| parent | 2919746c6494cc29bda375c5737b1c86b7e888d1 (diff) | |
| download | emacs-fe239e8e52c9aa8e0e23790b4a7a12a5da49625a.tar.gz | |
Remove trailing / from directory names.
* configure (ns_appdir, OLDXMENU, TOOLTIP_SUPPORT): Remove
trailing / from directory names.
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 18 |
1 files changed, 9 insertions, 9 deletions
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" && \ |