Explorar o código

* Pass INSTALL_LIBDIR to fpmake

git-svn-id: trunk@43892 -
joost %!s(int64=5) %!d(string=hai) anos
pai
achega
be301a3aed
Modificáronse 4 ficheiros con 12 adicións e 0 borrados
  1. 3 0
      packages/Makefile
  2. 3 0
      packages/Makefile.fpc
  3. 3 0
      utils/Makefile
  4. 3 0
      utils/Makefile.fpc

+ 3 - 0
packages/Makefile

@@ -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 - 0
packages/Makefile.fpc

@@ -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 - 0
utils/Makefile

@@ -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 - 0
utils/Makefile.fpc

@@ -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