* USEUNITDIR added to allow use of specific unit dir

tests/units/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/07/30]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/09/26]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx
@@ -58,6 +58,9 @@ ifdef inUnix
 PATHSEP=/
 else
 PATHSEP:=$(subst /,\,/)
+ifneq ($(findstring sh.exe,$(SHELL)),)
+PATHSEP=/
+endif
 endif
 ifdef PWD
 BASEDIR:=$(subst \,/,$(shell $(PWD)))
@@ -140,6 +143,16 @@ ifndef OS_TARGET
 OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 endif
+ifndef CPU_TARGET
+ifdef CPU_TARGET_DEFAULT
+CPU_TARGET=$(CPU_TARGET_DEFAULT)
+endif
+endif
+ifndef OS_TARGET
+ifdef OS_TARGET_DEFAULT
+OS_TARGET=$(OS_TARGET_DEFAULT)
+endif
+endif
 FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)
 FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)
 ifneq ($(FULL_TARGET),$(FULL_SOURCE))
@@ -826,6 +839,9 @@ endif
 ifneq ($(OS_TARGET),$(OS_SOURCE))
 override FPCOPT+=-T$(OS_TARGET)
 endif
+ifeq ($(OS_SOURCE),openbsd)
+override FPCOPT+=-FD$(NEW_BINUTILS_PATH)
+endif
 ifdef UNITDIR
 override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
 endif
@@ -1126,6 +1142,7 @@ fpc_baseinfo:
 	@$(ECHO)  Rm........ $(RMPROG)
 	@$(ECHO)  GInstall.. $(GINSTALL)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Shell..... $(SHELL)
 	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
@@ -1207,6 +1224,7 @@ include fpcmake.loc
 endif
 .PHONY: rtl fcl clean
 INSTALLOPT=INSTALL_UNITDIR=$(BASEDIR)
+ifndef USEUNITDIR
 rtl:
 	$(MAKE) -C ../../rtl all
 	$(MAKE) -C ../../rtl install $(INSTALLOPT)
@@ -1214,4 +1232,13 @@ fcl:
 	$(MAKE) -C ../../fcl all
 	$(MAKE) -C ../../fcl install $(INSTALLOPT)
 clean : cleanall
+	$(MAKE) -C ../../rtl clean
+	$(MAKE) -C ../../fcl clean
+else
+rtl:
+	$(COPY) $(USEUNITDIR)/* .
+	$(ECHO) Copied > $(FPCMADE)
+fcl: rtl
+clean : cleanall
+endif
 erroru$(PPUEXT): erroru.pp rtl fcl

tests/units/Makefile.fpc

@@ -18,6 +18,8 @@ fpcdir=../..
 
 INSTALLOPT=INSTALL_UNITDIR=$(BASEDIR)
 
+ifndef USEUNITDIR
+
 rtl:
         $(MAKE) -C ../../rtl all
         $(MAKE) -C ../../rtl install $(INSTALLOPT)
@@ -27,6 +29,22 @@ fcl:
         $(MAKE) -C ../../fcl install $(INSTALLOPT)
 
 clean : cleanall
+        $(MAKE) -C ../../rtl clean
+        $(MAKE) -C ../../fcl clean
+
+else
+
+rtl:
+        $(COPY) $(USEUNITDIR)/* .
+        $(ECHO) Copied > $(FPCMADE)
+
+fcl: rtl
+
+clean : cleanall
+
+endif
+
+
 
 erroru$(PPUEXT): erroru.pp rtl fcl