|
|
@@ -1,5 +1,5 @@
|
|
|
#
|
|
|
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
|
|
|
+# Makefile generated by fpcmake v0.99.13 [2000/01/27]
|
|
|
#
|
|
|
|
|
|
defaultrule: help
|
|
|
@@ -77,13 +77,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
|
|
|
@@ -168,11 +169,18 @@ BASEPACKDIR=$(BASEDIR)/basepack
|
|
|
|
|
|
# Use new ppc386
|
|
|
PPNEW=$(BASEDIR)/$(CVSBASE)/compiler/ppc386$(EXEEXT)
|
|
|
+
|
|
|
+# Don't use ppufiles for win32 becuase of commandline length problems
|
|
|
+ifneq ($(OS_TARGET),win32)
|
|
|
PPUFILESNEW=$(BASEDIR)/$(CVSBASE)/utils/ppufiles$(EXEEXT)
|
|
|
+endif
|
|
|
|
|
|
# Build/install options
|
|
|
BUILDOPTS=FPC=$(PPNEW) RELEASE=1
|
|
|
-INSTALLOPTS=FPC=$(PPNEW) PPUFILES=$(PPUFILESNEW) ZIPDESTDIR=$(BASEDIR)
|
|
|
+INSTALLOPTS=FPC=$(PPNEW) ZIPDESTDIR=$(BASEDIR)
|
|
|
+ifdef PPUFILESNEW
|
|
|
+override INSTALLOPT+=PPUFILES=$(PPUFILESNEW)
|
|
|
+endif
|
|
|
#####################################################################
|
|
|
# FPCDIR Setting
|
|
|
#####################################################################
|
|
|
@@ -197,14 +205,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