Browse Source

* typo in fcl support

peter 21 years ago
parent
commit
ea0940bea0
2 changed files with 8 additions and 4 deletions
  1. 7 3
      tests/units/Makefile
  2. 1 1
      tests/units/Makefile.fpc

+ 7 - 3
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

+ 1 - 1
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