|
|
@@ -83,13 +83,14 @@ ifdef PP
|
|
|
FPC=$(PP)
|
|
|
else
|
|
|
ifdef inOS2
|
|
|
-FPC=ppos2$(EXEEXT)
|
|
|
+FPC=ppos2
|
|
|
else
|
|
|
-FPC=ppc386$(EXEEXT)
|
|
|
+FPC=ppc386
|
|
|
endif
|
|
|
endif
|
|
|
endif
|
|
|
-override FPC:=$(subst \,/,$(FPC))
|
|
|
+override FPC:=$(subst $(EXEEXT),,$(FPC))
|
|
|
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
|
|
|
|
|
|
# Target OS
|
|
|
ifndef OS_TARGET
|
|
|
@@ -145,14 +146,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
|
|
|
override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
|
|
|
endif
|
|
|
else
|
|
|
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
|
|
|
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
|
|
|
override FPCDIR:=$(FPCDIR)/..
|
|
|
ifeq ($(wildcard $(FPCDIR)/rtl),)
|
|
|
ifeq ($(wildcard $(FPCDIR)/units),)
|
|
|
override FPCDIR:=$(FPCDIR)/..
|
|
|
ifeq ($(wildcard $(FPCDIR)/rtl),)
|
|
|
ifeq ($(wildcard $(FPCDIR)/units),)
|
|
|
-override FPCDIR=wrong
|
|
|
+override FPCDIR=c:/pp
|
|
|
endif
|
|
|
endif
|
|
|
endif
|
peter