Use BASEFPCDIR instead of ../..

git-svn-id: trunk@32954 -

tests/tstunits/Makefile.fpc

@@ -41,6 +41,10 @@ override CROSSOPT:=$(OPT)
 override OPT=
 endif
 
+ifndef BASEFPCDIR
+BASEFPCDIR=../..
+endif
+
 #############################
 # RTL
 #
@@ -73,14 +77,16 @@ rtl : rtl-stamp.$(FULL_TARGET)
 
 DUMMYINSTALLDIR=$(BASEDIR)/tmp
 INSTALLOPT=INSTALL_PREFIX=$(DUMMYINSTALLDIR) INSTALL_UNITDIR=$(BASEDIR)/$(COMPILER_TARGETDIR)
-FPCUNITDIR=../../packages/fcl-fpcunit/src
+FPCUNITDIR=$(BASEFPCDIR)/packages/fcl-fpcunit/src
 
 fpcunit-stamp.$(FULL_TARGET):
 ifneq ($(OS_TARGET),msdos)
 ifneq ($(CPU_TARGET),avr)
+ifneq ($(CPU_TARGET),jvm)
  	$(TESTCOMPILER) -Fu$(BASEDIR)/$(COMPILER_TARGETDIR) $(FPCUNITDIR)/testutils
         $(TESTCOMPILER) -Fu$(BASEDIR)/$(COMPILER_TARGETDIR) $(FPCUNITDIR)/fpcunit
 endif
+endif
 endif
         $(ECHO) Compiled > fpcunit-stamp.$(FULL_TARGET)
 
@@ -101,7 +107,7 @@ fpcunit : fpcunit-stamp.$(FULL_TARGET)
 
 DUMMYINSTALLDIR=$(BASEDIR)/tmp
 INSTALLOPT=INSTALL_PREFIX=$(DUMMYINSTALLDIR) INSTALL_UNITDIR=$(BASEDIR)/$(COMPILER_TARGETDIR)
-PACKAGESDIR=../../packages
+PACKAGESDIR=$(BASEFPCDIR)/packages
 
 packages-stamp.$(FULL_TARGET):
 ifneq ($(inOS2),)