paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-13 11:49:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Regenerated after: Use BASEFPCDIR instead of ../..

Browse Source 
git-svn-id: trunk@32955 -
This commit is contained in:
pierre 2016-01-16 01:13:56 +00:00
parent d076552751
commit 4c979994ff
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/tstunits/Makefile
View File

@ -1881,6 +1881,9 @@ ifdef CROSSCOMPILE
override CROSSOPT:=$(OPT) override CROSSOPT:=$(OPT)
override OPT= override OPT=
endif endif
ifndef BASEFPCDIR
BASEFPCDIR=../..
endif
DUMMYINSTALLDIR=$(BASEDIR)/tmp DUMMYINSTALLDIR=$(BASEDIR)/tmp
INSTALLOPT=INSTALL_PREFIX=$(DUMMYINSTALLDIR) INSTALL_UNITDIR=$(BASEDIR)/$(COMPILER_TARGETDIR) INSTALLOPT=INSTALL_PREFIX=$(DUMMYINSTALLDIR) INSTALL_UNITDIR=$(BASEDIR)/$(COMPILER_TARGETDIR)
rtl-stamp.$(FULL_TARGET): rtl-stamp.$(FULL_TARGET):
@ -1899,13 +1902,15 @@ distcleanrtl: cleanrtl
rtl : rtl-stamp.$(FULL_TARGET) rtl : rtl-stamp.$(FULL_TARGET)
DUMMYINSTALLDIR=$(BASEDIR)/tmp DUMMYINSTALLDIR=$(BASEDIR)/tmp
INSTALLOPT=INSTALL_PREFIX=$(DUMMYINSTALLDIR) INSTALL_UNITDIR=$(BASEDIR)/$(COMPILER_TARGETDIR) INSTALLOPT=INSTALL_PREFIX=$(DUMMYINSTALLDIR) INSTALL_UNITDIR=$(BASEDIR)/$(COMPILER_TARGETDIR)
FPCUNITDIR=../../packages/fcl-fpcunit/src FPCUNITDIR=$(BASEFPCDIR)/packages/fcl-fpcunit/src
fpcunit-stamp.$(FULL_TARGET): fpcunit-stamp.$(FULL_TARGET):
ifneq ($(OS_TARGET),msdos) ifneq ($(OS_TARGET),msdos)
ifneq ($(CPU_TARGET),avr) ifneq ($(CPU_TARGET),avr)
ifneq ($(CPU_TARGET),jvm)
$(TESTCOMPILER) -Fu$(BASEDIR)/$(COMPILER_TARGETDIR) $(FPCUNITDIR)/testutils $(TESTCOMPILER) -Fu$(BASEDIR)/$(COMPILER_TARGETDIR) $(FPCUNITDIR)/testutils
$(TESTCOMPILER) -Fu$(BASEDIR)/$(COMPILER_TARGETDIR) $(FPCUNITDIR)/fpcunit $(TESTCOMPILER) -Fu$(BASEDIR)/$(COMPILER_TARGETDIR) $(FPCUNITDIR)/fpcunit
endif endif
endif
endif endif
$(ECHO) Compiled > fpcunit-stamp.$(FULL_TARGET) $(ECHO) Compiled > fpcunit-stamp.$(FULL_TARGET)
cleanfpcunit: cleanfpcunit:
@ -1917,7 +1922,7 @@ distcleanfpcunit: cleanfpcunit
fpcunit : fpcunit-stamp.$(FULL_TARGET) fpcunit : fpcunit-stamp.$(FULL_TARGET)
DUMMYINSTALLDIR=$(BASEDIR)/tmp DUMMYINSTALLDIR=$(BASEDIR)/tmp
INSTALLOPT=INSTALL_PREFIX=$(DUMMYINSTALLDIR) INSTALL_UNITDIR=$(BASEDIR)/$(COMPILER_TARGETDIR) INSTALLOPT=INSTALL_PREFIX=$(DUMMYINSTALLDIR) INSTALL_UNITDIR=$(BASEDIR)/$(COMPILER_TARGETDIR)
PACKAGESDIR=../../packages PACKAGESDIR=$(BASEFPCDIR)/packages
packages-stamp.$(FULL_TARGET): packages-stamp.$(FULL_TARGET):
ifneq ($(inOS2),) ifneq ($(inOS2),)
$(MAKE) -C ../../packages all "OPT=$(OPT) -n" "CROSSOPT=$(CROSSOPT)" $(MAKE) -C ../../packages all "OPT=$(OPT) -n" "CROSSOPT=$(CROSSOPT)"