* configure.in: Removed some abuses of CPPFLAGS. Removed useless
tests for cp, mv and rm. * Make.common.in: Removed variables xv_bindir and STRIP. Variables CP, MV and RMF are assigned trivial values.
Этот коммит содержится в:
родитель
536a5ce8d5
Коммит
8d204881e7
@ -1,5 +1,10 @@
|
|||||||
2000-09-14 Pavel Roskin <proski@gnu.org>
|
2000-09-14 Pavel Roskin <proski@gnu.org>
|
||||||
|
|
||||||
|
* configure.in: Removed some abuses of CPPFLAGS. Removed useless
|
||||||
|
tests for cp, mv and rm.
|
||||||
|
* Make.common.in: Removed variables xv_bindir and STRIP.
|
||||||
|
Variables CP, MV and RMF are assigned trivial values.
|
||||||
|
|
||||||
* edit/Makefile.in: Don't link headers, add extra includes
|
* edit/Makefile.in: Don't link headers, add extra includes
|
||||||
to CPPFLAGS instead. Put links to the build directory.
|
to CPPFLAGS instead. Put links to the build directory.
|
||||||
Remove the hack with "mx" - it is not needed anymore.
|
Remove the hack with "mx" - it is not needed anymore.
|
||||||
|
@ -22,7 +22,6 @@ datadir = @datadir@
|
|||||||
libdir = @libdir@
|
libdir = @libdir@
|
||||||
mandir = @mandir@
|
mandir = @mandir@
|
||||||
gnomeicondir = @gnomeicondir@
|
gnomeicondir = @gnomeicondir@
|
||||||
xv_bindir = @xv_bindir@
|
|
||||||
corbadir = $(sysconfdir)/CORBA/servers
|
corbadir = $(sysconfdir)/CORBA/servers
|
||||||
mclibdir = $(libdir)/mc
|
mclibdir = $(libdir)/mc
|
||||||
desktopdir = $(mclibdir)/desktop-scripts
|
desktopdir = $(mclibdir)/desktop-scripts
|
||||||
@ -44,16 +43,14 @@ man8ext = 8
|
|||||||
MKINSTALLDIRS = @MKINSTALLDIRS@
|
MKINSTALLDIRS = @MKINSTALLDIRS@
|
||||||
SEDCMD = @SEDCMD@
|
SEDCMD = @SEDCMD@
|
||||||
SEDCMD2 = @SEDCMD2@
|
SEDCMD2 = @SEDCMD2@
|
||||||
STRIP = @STRIP@
|
|
||||||
@SET_MAKE@
|
@SET_MAKE@
|
||||||
CC = @CC@
|
CC = @CC@
|
||||||
CPP = @CPP@
|
CPP = @CPP@
|
||||||
AR = @AR@
|
AR = @AR@
|
||||||
RANLIB = @RANLIB@
|
RANLIB = @RANLIB@
|
||||||
RM = @RM@
|
RMF = rm -f
|
||||||
RMF = @RM@ -f
|
MV = mv
|
||||||
MV = @MV@
|
CP = mv
|
||||||
CP = @CP@
|
|
||||||
LN_S = @LN_S@
|
LN_S = @LN_S@
|
||||||
AWK = @AWK@
|
AWK = @AWK@
|
||||||
AWK_VAR_OPTION = @AWK_VAR_OPTION@
|
AWK_VAR_OPTION = @AWK_VAR_OPTION@
|
||||||
|
@ -50,9 +50,6 @@ AC_ISC_POSIX
|
|||||||
MC_HPUX_PROG_CC_STDC
|
MC_HPUX_PROG_CC_STDC
|
||||||
AC_HEADER_MAJOR
|
AC_HEADER_MAJOR
|
||||||
AC_C_CONST
|
AC_C_CONST
|
||||||
AC_PATH_PROG(MV, mv, mv)
|
|
||||||
AC_PATH_PROG(CP, cp, cp)
|
|
||||||
AC_PATH_PROG(RM, rm, rm)
|
|
||||||
AC_PATH_PROG(CHMOD, chmod, :)
|
AC_PATH_PROG(CHMOD, chmod, :)
|
||||||
AC_PATH_PROG(AR, ar, ar)
|
AC_PATH_PROG(AR, ar, ar)
|
||||||
|
|
||||||
@ -460,8 +457,7 @@ AC_ARG_WITH(osf1-curses,
|
|||||||
|
|
||||||
AC_ARG_WITH(vcurses,
|
AC_ARG_WITH(vcurses,
|
||||||
[--with-vcurses[=incdir] Used to force SysV curses],
|
[--with-vcurses[=incdir] Used to force SysV curses],
|
||||||
if test x$withval = xyes; then
|
if test x$withval = xyes; then :
|
||||||
CPPFLAGS="$CPPFLAGS"
|
|
||||||
else
|
else
|
||||||
CPPFLAGS="$CPPFLAGS -I$withval"
|
CPPFLAGS="$CPPFLAGS -I$withval"
|
||||||
fi
|
fi
|
||||||
@ -717,7 +713,6 @@ dnl
|
|||||||
if test x$GCC = x
|
if test x$GCC = x
|
||||||
then
|
then
|
||||||
AC_DEFINE(OLD_TOOLS)
|
AC_DEFINE(OLD_TOOLS)
|
||||||
CPPFLAGS="$CPPFLAGS"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
@ -1177,7 +1172,6 @@ esac
|
|||||||
|
|
||||||
LIBS="$LIBS $posix_libs"
|
LIBS="$LIBS $posix_libs"
|
||||||
|
|
||||||
CPPFLAGS="-I.. $CPPFLAGS"
|
|
||||||
AC_SUBST(CFLAGS)
|
AC_SUBST(CFLAGS)
|
||||||
AC_SUBST(CPPFLAGS)
|
AC_SUBST(CPPFLAGS)
|
||||||
AC_SUBST(MCCPPFLAGS)
|
AC_SUBST(MCCPPFLAGS)
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user