diff --git a/packages/Makefile b/packages/Makefile index de36b86a48..e06d1127c0 100644 --- a/packages/Makefile +++ b/packages/Makefile @@ -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 diff --git a/packages/Makefile.fpc b/packages/Makefile.fpc index 1a856db5cb..47a06e5939 100644 --- a/packages/Makefile.fpc +++ b/packages/Makefile.fpc @@ -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) diff --git a/utils/Makefile b/utils/Makefile index 2ef9c02366..b481d3b799 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -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 diff --git a/utils/Makefile.fpc b/utils/Makefile.fpc index 921a068795..7984e7d22d 100644 --- a/utils/Makefile.fpc +++ b/utils/Makefile.fpc @@ -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