|
@@ -335,9 +335,6 @@ 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
|
|
@@ -361,6 +358,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)
|
|
override INSTALL_FPCPACKAGE=y
|
|
override INSTALL_FPCPACKAGE=y
|
|
override INSTALL_FPCSUBDIR=packages
|
|
override INSTALL_FPCSUBDIR=packages
|