* configure.in: remove any manupulations with top_srcdir.

Don't change CPPGLAGS when the internal editor is enabled,
instead do it ...
* edit/Makefile.in, gtkedit/Makefile.in: ... here
This commit is contained in:
Pavel Roskin 2000-09-14 15:31:25 +00:00
parent 91e7526108
commit 969d11e456
4 changed files with 7 additions and 6 deletions

View File

@ -1,5 +1,10 @@
2000-09-14 Pavel Roskin <proski@gnu.org>
* configure.in: remove any manupulations with top_srcdir.
Don't change CPPGLAGS when the internal editor is enabled,
instead do it ...
* edit/Makefile.in, gtkedit/Makefile.in: ... here
* configure.in, Make.common.in, doc/Makefile.in,
edit/Makefile.in, gnome/Makefile.in, gtkedit/Makefile.in,
slang/Makefile.in, src/Makefile.in, vfs/Make-mc.in: rootdir

View File

@ -7,9 +7,6 @@ AM_INIT_AUTOMAKE(mc, 4.5.51)
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
top_srcdir=`dirname $0`
AC_SUBST(top_srcdir)
dnl This is path where we're looking for headers in addition to /usr/include
dnl and whatever cpp defaults to.
include_additional_path="/usr/local/include /usr/contrib/include /opt/gnu/include"
@ -936,7 +933,6 @@ AC_DEFUN(AC_WITH_EDIT, [
LIBEDIT_A="libedit.a"
MCEDIT="mcedit"
LEDIT="-ledit"
CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)"
EDIT_msg="yes"
AC_MSG_RESULT(will call internal editor)
])

View File

@ -5,7 +5,7 @@ VPATH = @srcdir@
@MCFG@@MCF@
CFLAGS = $(XCFLAGS)
CPPFLAGS = $(XCPPFLAGS)
CPPFLAGS = $(XCPPFLAGS) -I$(top_srcdir)
LDFLAGS = $(XLDFLAGS)
DEFS = $(XDEFS)
LIBS = @SHADOWLIB@ $(XLIBS) @TERMNET@ @PAMLIBS@ $(XLIB)

View File

@ -5,7 +5,7 @@ VPATH = @srcdir@
@MCFG@@MCF@
CFLAGS = $(XCFLAGS)
CPPFLAGS = $(XCPPFLAGS) @GNOME_INCLUDEDIR@
CPPFLAGS = $(XCPPFLAGS) @GNOME_INCLUDEDIR@ -I$(top_srcdir)
LDFLAGS = $(XLDFLAGS)
DEFS = $(XDEFS)
LIBS = @SHADOWLIB@ $(XLIBS) @TERMNET@ @PAMLIBS@ $(XLIB)