2
0
Эх сурвалжийг харах

* 1.0 uses also the new fpcmake

peter 24 жил өмнө
parent
commit
8c521811f7

+ 0 - 4
tests/units/Makefile

@@ -820,11 +820,7 @@ ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
 .PHONY: rtl fcl clean
-ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
-INSTALLOPT=UNITINSTALLDIR=$(BASEDIR)
-else
 INSTALLOPT=INSTALL_UNITDIR=$(BASEDIR)
-endif
 rtl:
 	$(MAKE) -C ../../rtl all
 	$(MAKE) -C ../../rtl install $(INSTALLOPT)

+ 0 - 4
tests/units/Makefile.fpc

@@ -16,11 +16,7 @@ fpcdir=../..
 [rules]
 .PHONY: rtl fcl clean
 
-ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
-INSTALLOPT=UNITINSTALLDIR=$(BASEDIR)
-else
 INSTALLOPT=INSTALL_UNITDIR=$(BASEDIR)
-endif
 
 rtl:
         $(MAKE) -C ../../rtl all