* Pass INSTALL_LIBDIR to fpmake

git-svn-id: trunk@43892 -
This commit is contained in:
joost 2020-01-08 22:25:19 +00:00
parent 76bad447b2
commit be301a3aed
4 changed files with 12 additions and 0 deletions

View File

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

View File

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

View File

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

View File

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