* allow overriding the FPCMAKE used for installing by specifying FPCMAKE

on the make command line

git-svn-id: trunk@22505 -
This commit is contained in:
Jonas Maebe 2012-09-30 14:14:23 +00:00
parent f7ac18f2a0
commit 91e1bdb08c
2 changed files with 8 additions and 0 deletions

View File

@ -406,11 +406,15 @@ ifndef DIST_DESTDIR
export DIST_DESTDIR:=$(BASEDIR)
endif
BASEPACKDIR=$(BASEDIR)/basepack
ifndef FPCMAKE
ifeq ($(FULL_SOURCE),$(FULL_TARGET))
FPCMAKENEW=$(BASEDIR)/utils/fpcm/fpcmake$(EXEEXT)
else
FPCMAKENEW=fpcmake
endif
else
FPCMAKENEW=$(FPCMAKE)
endif
CLEANOPTS=FPC=$(PPNEW)
BUILDOPTS=FPC=$(PPNEW) RELEASE=1
INSTALLOPTS=FPC=$(PPNEW) ZIPDESTDIR=$(BASEDIR) FPCMAKE=$(FPCMAKENEW)

View File

@ -149,11 +149,15 @@ endif
BASEPACKDIR=$(BASEDIR)/basepack
# Newly created fpcmake
ifndef FPCMAKE
ifeq ($(FULL_SOURCE),$(FULL_TARGET))
FPCMAKENEW=$(BASEDIR)/utils/fpcm/fpcmake$(EXEEXT)
else
FPCMAKENEW=fpcmake
endif
else
FPCMAKENEW=$(FPCMAKE)
endif
# Build/install options
CLEANOPTS=FPC=$(PPNEW)