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

* fix for fpcmake running when crosscompiling. Now uses preinstalled fpcmake for package generation

Browse Source
This commit is contained in:
marco 2003-10-06 14:31:11 +00:00
parent cb457e1a34
commit 1f6833941d
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -1,5 +1,5 @@
#
# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/04]
# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/06]
#
default: help
MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom
@ -302,7 +302,14 @@ ifndef DIST_DESTDIR
export DIST_DESTDIR:=$(BASEDIR)
endif
BASEPACKDIR=$(BASEDIR)/basepack
FPCMAKENEW=$(BASEDIR)/utils/fpcm/fpcmake$(EXEEXT)
TEMPMAKENEW=$(BASEDIR)/utils/fpcm/fpcmake$(EXEEXT)
ifneq ($(CPU_SOURCE),$(PPC_TARGET))
TEMPMAKENEW=fpcmake
endif
ifneq ($(OS_SOURCE),$(OS_TARGET))
TEMPMAKENEW=fpcmake
endif
FPCMAKENEW=$(TEMPMAKENEW)
CLEANOPTS=FPC=$(PPNEW)
BUILDOPTS=FPC=$(PPNEW) RELEASE=1
INSTALLOPTS=FPC=$(PPNEW) ZIPDESTDIR=$(BASEDIR) FPCMAKE=$(FPCMAKENEW)

9
Makefile.fpc
View File

@ -138,7 +138,14 @@ endif
BASEPACKDIR=$(BASEDIR)/basepack
# Newly created fpcmake
FPCMAKENEW=$(BASEDIR)/utils/fpcm/fpcmake$(EXEEXT)
TEMPMAKENEW=$(BASEDIR)/utils/fpcm/fpcmake$(EXEEXT)
ifneq ($(CPU_SOURCE),$(PPC_TARGET))
TEMPMAKENEW=fpcmake
endif
ifneq ($(OS_SOURCE),$(OS_TARGET))
TEMPMAKENEW=fpcmake
endif
FPCMAKENEW=$(TEMPMAKENEW)
# Build/install options
CLEANOPTS=FPC=$(PPNEW)