paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-14 05:04:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

* don't use win32 ppufiles because of the commandline probs

Browse Source
This commit is contained in:
peter 2000-01-27 10:06:36 +00:00
parent 0d63b79f38
commit cbee192f3b
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
install/Makefile
View File

@ -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 defaultrule: help
@ -77,13 +77,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
@ -168,11 +169,18 @@ BASEPACKDIR=$(BASEDIR)/basepack
# Use new ppc386 # Use new ppc386
PPNEW=$(BASEDIR)/$(CVSBASE)/compiler/ppc386$(EXEEXT) 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) PPUFILESNEW=$(BASEDIR)/$(CVSBASE)/utils/ppufiles$(EXEEXT)
endif
# Build/install options # Build/install options
BUILDOPTS=FPC=$(PPNEW) RELEASE=1 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 # FPCDIR Setting
##################################################################### #####################################################################
@ -197,14 +205,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

9
install/Makefile.fpc
View File

@ -68,11 +68,18 @@ BASEPACKDIR=$(BASEDIR)/basepack
# Use new ppc386 # Use new ppc386
PPNEW=$(BASEDIR)/$(CVSBASE)/compiler/ppc386$(EXEEXT) 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) PPUFILESNEW=$(BASEDIR)/$(CVSBASE)/utils/ppufiles$(EXEEXT)
endif
# Build/install options # Build/install options
BUILDOPTS=FPC=$(PPNEW) RELEASE=1 BUILDOPTS=FPC=$(PPNEW) RELEASE=1
INSTALLOPTS=FPC=$(PPNEW) PPUFILES=$(PPUFILESNEW) ZIPDESTDIR=$(BASEDIR) INSTALLOPTS=FPC=$(PPNEW) ZIPDESTDIR=$(BASEDIR)
ifdef PPUFILESNEW
override INSTALLOPT+=PPUFILES=$(PPUFILESNEW)
endif
[rules] [rules]