paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-22 04:09:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fixed to also work with 1.0.x fpcmake makefiles

Browse Source
This commit is contained in:
peter 2001-02-02 23:14:44 +00:00
parent 73d31da1ef
commit d3aa0f3f26
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/units/Makefile
View File

@ -785,11 +785,16 @@ ifneq ($(wildcard fpcmake.loc),)
include fpcmake.loc include fpcmake.loc
endif endif
.PHONY: rtl fcl clean .PHONY: rtl fcl clean
ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
INSTALLOPT=UNITINSTALLDIR=$(BASEDIR)
else
INSTALLOPT=INSTALL_UNITDIR=$(BASEDIR)
endif
rtl: rtl:
$(MAKE) -C ../../rtl/$(OS_TARGET) all $(MAKE) -C ../../rtl all
$(MAKE) -C ../../rtl/$(OS_TARGET) install INSTALL_UNITDIR=$(BASEDIR) $(MAKE) -C ../../rtl install $(INSTALLOPT)
fcl: fcl:
$(MAKE) -C ../../fcl/$(OS_TARGET) all $(MAKE) -C ../../fcl all
$(MAKE) -C ../../fcl/$(OS_TARGET) install INSTALL_UNITDIR=$(BASEDIR) $(MAKE) -C ../../fcl install $(INSTALLOPT)
clean : cleanall clean : cleanall
erroru$(PPUEXT): erroru.pp rtl fcl erroru$(PPUEXT): erroru.pp rtl fcl

14
tests/units/Makefile.fpc
View File

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