paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-10-26 06:12:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

* fixed FPCDIR detection for dos/win32

Browse Source
This commit is contained in:
peter 2000-01-27 10:09:14 +00:00
parent cbee192f3b
commit 97170bc241
2 changed files with 188 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

366
utils/fpcmake.inc
View File

File diff suppressed because it is too large Load Diff

11
utils/fpcmake.ini
View File

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