* initial support for INSTALL_BINDIR. If that option isn't used behaviour

   should be the same as old. Mantis #27272

git-svn-id: trunk@31166 -

ide/Makefile

@@ -328,6 +328,9 @@ endif
 ifdef INSTALL_UNITDIR
 FPMAKE_INSTALL_OPT+=--unitinstalldir=$(INSTALL_UNITDIR)
 endif
+ifdef INSTALL_BINDIR
+FPMAKE_INSTALL_OPT+=--bininstalldir=$(INSTALL_BINDIR)
+endif
 ifdef OS_TARGET
 FPC_TARGETOPT+=--os=$(OS_TARGET)
 endif

ide/Makefile.fpc

@@ -16,6 +16,10 @@ fpcdir=..
 ifdef INSTALL_UNITDIR
 FPMAKE_INSTALL_OPT+=--unitinstalldir=$(INSTALL_UNITDIR)
 endif
+ifdef INSTALL_BINDIR
+FPMAKE_INSTALL_OPT+=--bininstalldir=$(INSTALL_BINDIR)
+endif
+
 # Translate OS_TARGET and CPU_TARGET to fpmake's --os and --cpu parameters
 ifdef OS_TARGET
 FPC_TARGETOPT+=--os=$(OS_TARGET)

packages/Makefile

@@ -328,6 +328,9 @@ endif
 ifdef INSTALL_UNITDIR
 FPMAKE_INSTALL_OPT+=--unitinstalldir=$(INSTALL_UNITDIR)
 endif
+ifdef INSTALL_BINDIR
+FPMAKE_INSTALL_OPT+=--bininstalldir=$(INSTALL_BINDIR)
+endif
 ifdef OS_TARGET
 FPC_TARGETOPT+=--os=$(OS_TARGET)
 endif

packages/Makefile.fpc

@@ -17,6 +17,9 @@ fpcdir=..
 ifdef INSTALL_UNITDIR
 FPMAKE_INSTALL_OPT+=--unitinstalldir=$(INSTALL_UNITDIR)
 endif
+ifdef INSTALL_BINDIR
+FPMAKE_INSTALL_OPT+=--bininstalldir=$(INSTALL_BINDIR)
+endif
 # Translate OS_TARGET and CPU_TARGET to fpmake's --os and --cpu parameters
 ifdef OS_TARGET
 FPC_TARGETOPT+=--os=$(OS_TARGET)

packages/fpmkunit/src/fpmkunit.pp

@@ -4700,6 +4700,8 @@ begin
 {$endif NO_THREADING}
     else if CheckOption(I,'B','baseinstalldir') then
       Defaults.BaseInstallDir:=OptionArg(I)
+    else if CheckOption(I,'B','bininstalldir') then
+      Defaults.BinInstallDir:=OptionArg(I)
     else if CheckOption(I,'U','unitinstalldir') then
       Defaults.UnitInstallDir:=OptionArg(I)
     else if CheckOption(I,'UL','localunitdir') then

utils/Makefile

@@ -328,6 +328,9 @@ endif
 ifdef INSTALL_UNITDIR
 FPMAKE_INSTALL_OPT+=--unitinstalldir=$(INSTALL_UNITDIR)
 endif
+ifdef INSTALL_BINDIR
+FPMAKE_INSTALL_OPT+=--bininstalldir=$(INSTALL_BINDIR)
+endif
 ifdef OS_TARGET
 FPC_TARGETOPT+=--os=$(OS_TARGET)
 endif

utils/Makefile.fpc

@@ -16,6 +16,10 @@ fpcdir=..
 ifdef INSTALL_UNITDIR
 FPMAKE_INSTALL_OPT+=--unitinstalldir=$(INSTALL_UNITDIR)
 endif
+ifdef INSTALL_BINDIR
+FPMAKE_INSTALL_OPT+=--bininstalldir=$(INSTALL_BINDIR)
+endif
+
 # Translate OS_TARGET and CPU_TARGET to fpmake's --os and --cpu parameters
 ifdef OS_TARGET
 FPC_TARGETOPT+=--os=$(OS_TARGET)