diff options
| author | joost <joost@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2020-01-13 21:38:28 +0000 |
|---|---|---|
| committer | joost <joost@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2020-01-13 21:38:28 +0000 |
| commit | 56b17df26a3899e9ee647f93b1cae0b5a976499c (patch) | |
| tree | a13a77f8091b69dd4ab3a8d31449f9907e029f09 /utils | |
| parent | ed81c700f71e8f11b65b1c1b8d37a8751e42964a (diff) | |
| download | fpc-56b17df26a3899e9ee647f93b1cae0b5a976499c.tar.gz | |
--- 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: https://svn.freepascal.org/svn/fpc/branches/fixes_3_2@43932 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/Makefile | 3 | ||||
| -rw-r--r-- | utils/Makefile.fpc | 3 |
2 files changed, 6 insertions, 0 deletions
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 |