From ea0940bea0e3ab65cf90982aa66f61106c6fd33b Mon Sep 17 00:00:00 2001 From: peter Date: Tue, 23 Dec 2003 22:20:46 +0000 Subject: [PATCH] * typo in fcl support --- tests/units/Makefile | 10 +++++++--- tests/units/Makefile.fpc | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/units/Makefile b/tests/units/Makefile index 9f2d0a59b9..ba702d27c1 100644 --- a/tests/units/Makefile +++ b/tests/units/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/27] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/11/01] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -733,7 +733,11 @@ endif endif export MVPROG ifndef ECHOREDIR -ECHOREDIR:=$(subst /,$(PATHSEP),$(ECHO)) +ifndef inUnix +ECHOREDIR=echo +else +ECHOREDIR=$(ECHO) +endif endif ifndef COPY COPY:=$(CPPROG) -fp @@ -1454,7 +1458,7 @@ makefiles: fpc_makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif -ifeq ($(findstring 1.0.,$(FPC_VERSION)),) +ifneq ($(findstring 1.0.,$(FPC_VERSION)),) FCL=fcl endif DUMMYINSTALLDIR=$(BASEDIR)/tmp diff --git a/tests/units/Makefile.fpc b/tests/units/Makefile.fpc index 09045eaab7..52a27352d3 100644 --- a/tests/units/Makefile.fpc +++ b/tests/units/Makefile.fpc @@ -16,7 +16,7 @@ fpcdir=../.. [rules] # Only 1.1 has Classes in the RTL -ifeq ($(findstring 1.0.,$(FPC_VERSION)),) +ifneq ($(findstring 1.0.,$(FPC_VERSION)),) FCL=fcl endif