|
@@ -176,11 +176,15 @@ endif
|
|
|
override FPC:=$(subst $(SRCEXEEXT),,$(FPC))
|
|
override FPC:=$(subst $(SRCEXEEXT),,$(FPC))
|
|
|
override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT)
|
|
override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT)
|
|
|
|
|
|
|
|
-# Try to find the binary, if not found give an error
|
|
|
|
|
|
|
+# Try to find the binary direct first, otherwise in the path,
|
|
|
|
|
+# if not found give an error
|
|
|
FOUNDFPC:=$(strip $(wildcard $(FPC)))
|
|
FOUNDFPC:=$(strip $(wildcard $(FPC)))
|
|
|
ifeq ($(FOUNDFPC),)
|
|
ifeq ($(FOUNDFPC),)
|
|
|
|
|
+FOUNDFPC=$(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))
|
|
|
|
|
+ifeq ($(FOUNDFPC),)
|
|
|
$(error Compiler $(FPC) not found)
|
|
$(error Compiler $(FPC) not found)
|
|
|
endif
|
|
endif
|
|
|
|
|
+endif
|
|
|
|
|
|
|
|
# For 1.1 and up we can use a single compiler call to retrieve
|
|
# For 1.1 and up we can use a single compiler call to retrieve
|
|
|
# all needed information
|
|
# all needed information
|
peter