mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-09-10 10:09:21 +02:00
* 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:
parent
f7ac18f2a0
commit
91e1bdb08c
4
Makefile
4
Makefile
@ -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)
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user