paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-13 11:09:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

* allow overriding the FPCMAKE used for installing by specifying FPCMAKE

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

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

4
Makefile.fpc
View File

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