paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-24 20:49:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

--- Merging r43892 into '.':

Browse Source 
U    packages/Makefile
U    packages/Makefile.fpc
U    utils/Makefile
U    utils/Makefile.fpc
--- Recording mergeinfo for merge of r43892 into '.':
 U   .

git-svn-id: branches/fixes_3_2@43932 -
This commit is contained in:
joost 2020-01-13 21:38:28 +00:00
parent 700c4453df
commit b068f8fe00
4 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/Makefile
View File

@ -335,6 +335,9 @@ endif
ifdef INSTALL_BINDIR ifdef INSTALL_BINDIR
FPMAKE_INSTALL_OPT+=--bininstalldir=$(INSTALL_BINDIR) FPMAKE_INSTALL_OPT+=--bininstalldir=$(INSTALL_BINDIR)
endif endif
ifdef INSTALL_LIBDIR
FPMAKE_INSTALL_OPT+=--libinstalldir=$(INSTALL_LIBDIR)
endif
ifdef OS_TARGET ifdef OS_TARGET
FPC_TARGETOPT+=--os=$(OS_TARGET) FPC_TARGETOPT+=--os=$(OS_TARGET)
endif endif

3
packages/Makefile.fpc
View File

@ -45,6 +45,9 @@ endif
ifdef UNITDIR_FPMAKE_FPMKUNIT ifdef UNITDIR_FPMAKE_FPMKUNIT
override COMPILER_FPMAKE_UNITDIR=$(UNITDIR_FPMAKE_FPMKUNIT) override COMPILER_FPMAKE_UNITDIR=$(UNITDIR_FPMAKE_FPMKUNIT)
endif endif
ifdef INSTALL_LIBDIR
FPMAKE_INSTALL_OPT+=--libinstalldir=$(INSTALL_LIBDIR)
endif
SUB_FPMAKE_SRCS=$(wildcard */fpmake.pp) SUB_FPMAKE_SRCS=$(wildcard */fpmake.pp)

3
utils/Makefile
View File

@ -335,6 +335,9 @@ endif
ifdef INSTALL_BINDIR ifdef INSTALL_BINDIR
FPMAKE_INSTALL_OPT+=--bininstalldir=$(INSTALL_BINDIR) FPMAKE_INSTALL_OPT+=--bininstalldir=$(INSTALL_BINDIR)
endif endif
ifdef INSTALL_LIBDIR
FPMAKE_INSTALL_OPT+=--libinstalldir=$(INSTALL_LIBDIR)
endif
ifdef OS_TARGET ifdef OS_TARGET
FPC_TARGETOPT+=--os=$(OS_TARGET) FPC_TARGETOPT+=--os=$(OS_TARGET)
endif endif

3
utils/Makefile.fpc
View File

@ -19,6 +19,9 @@ endif
ifdef INSTALL_BINDIR ifdef INSTALL_BINDIR
FPMAKE_INSTALL_OPT+=--bininstalldir=$(INSTALL_BINDIR) FPMAKE_INSTALL_OPT+=--bininstalldir=$(INSTALL_BINDIR)
endif endif
ifdef INSTALL_LIBDIR
FPMAKE_INSTALL_OPT+=--libinstalldir=$(INSTALL_LIBDIR)
endif
# Translate OS_TARGET and CPU_TARGET to fpmake's --os and --cpu parameters # Translate OS_TARGET and CPU_TARGET to fpmake's --os and --cpu parameters
ifdef OS_TARGET ifdef OS_TARGET