mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-08-14 19:49:09 +02:00
--- Merging r43892 into '.':
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:
parent
700c4453df
commit
b068f8fe00
@ -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
|
||||||
|
@ -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)
|
||||||
|
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user