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

* Override the for fpmake wrong value of COMPILER_TARGETDIR, so that executables are compiled into the right path

Browse Source 
git-svn-id: trunk@19977 -
This commit is contained in:
joost 2012-01-05 22:06:11 +00:00
parent fa98e0523d
commit 6b826cf3fa
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/chm/Makefile
View File

@ -302,6 +302,11 @@ ifdef CPU_TARGET
FPC_TARGETOPT+=--cpu=$(CPU_TARGET)
endif
LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT)
ifdef PACKAGEDIR_MAIN
COMPILER_TARGETDIR=$(PACKAGEDIR_MAIN)/bin/$(TARGETSUFFIX)
else
COMPILER_TARGETDIR=bin/$(TARGETSUFFIX)
endif
override INSTALL_FPCPACKAGE=y
ifdef REQUIRE_UNITSDIR
override UNITSDIR+=$(REQUIRE_UNITSDIR)

7
packages/chm/Makefile.fpc
View File

@ -24,6 +24,13 @@ ifdef CPU_TARGET
FPC_TARGETOPT+=--cpu=$(CPU_TARGET)
endif
LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT)
# By default COMPILER_TARGETDIR is set to '.'. This is passed in the -FE parameter to the compiler
# which leads to executables being placed into the wrong directory by the compiler.
ifdef PACKAGEDIR_MAIN
COMPILER_TARGETDIR=$(PACKAGEDIR_MAIN)/bin/$(TARGETSUFFIX)
else
COMPILER_TARGETDIR=bin/$(TARGETSUFFIX)
endif
[rules]
.NOTPARALLEL: