|
@@ -611,15 +611,16 @@ SYMLINKINSTALL_TARGETS=$(addsuffix _symlink_install,$(sort $(CYCLETARGETS) $(PPC
|
|
|
.PHONY: $(PPC_TARGETS) $(INSTALL_TARGETS)$(SYMLINKINSTALL_TARGETS)
|
|
|
|
|
|
$(PPC_TARGETS):
|
|
|
- $(MAKE) PPC_TARGET=$@ CPU_UNITDIR=$@ compiler
|
|
|
+ $(MAKE) PPC_TARGET=$@ CPU_UNITDIR=$@ compiler
|
|
|
|
|
|
$(INSTALL_TARGETS):
|
|
|
- $(MAKE) PPC_TARGET=$(subst _exe_install,,$@) CPU_UNITDIR=$(subst _exe_install,,$@) compiler
|
|
|
- $(MAKE) PPC_TARGET=$(subst _exe_install,,$@) CPU_UNITDIR=$(subst _exe_install,,$@) exeinstall
|
|
|
+ $(MAKE) PPC_TARGET=$(subst _exe_install,,$@) CPU_UNITDIR=$(subst _exe_install,,$@) compiler
|
|
|
+ $(MAKE) PPC_TARGET=$(subst _exe_install,,$@) CPU_UNITDIR=$(subst _exe_install,,$@) exeinstall
|
|
|
|
|
|
$(SYMLINKINSTALL_TARGETS):
|
|
|
- $(MAKE) PPC_TARGET=$(subst _symlink_install,,$@) CPU_UNITDIR=$(subst _symlink_install,,$@) compiler
|
|
|
- $(MAKE) PPC_TARGET=$(subst _symlink_install,,$@) CPU_UNITDIR=$(subst _symlink_install,,$@) installsymlink
|
|
|
+ $(MAKE) PPC_TARGET=$(subst _symlink_install,,$@) CPU_UNITDIR=$(subst _symlink_install,,$@) compiler
|
|
|
+ $(ECHO) "Compiler $(subst _symlink_install,,$@) finished, starting installsymlink"
|
|
|
+ $(MAKE) PPC_TARGET=$(subst _symlink_install,,$@) CPU_UNITDIR=$(subst _symlink_install,,$@) installsymlink
|
|
|
|
|
|
alltargets: $(ALLTARGETS)
|
|
|
|
|
@@ -1016,7 +1017,7 @@ cvstest:
|
|
|
# This is also the case for other CPUs that don't support
|
|
|
# 80bit real type.
|
|
|
|
|
|
-ifneq ($(findstring -dFPC_SOFT_FPUX80,$(OPT)),)
|
|
|
+ifeq ($(findstring -dFPC_SOFT_FPUX80,$(OPT)),)
|
|
|
ifeq ($(OS_SOURCE),win64)
|
|
|
EXCLUDE_80BIT_TARGETS=1
|
|
|
endif
|
|
@@ -1087,10 +1088,11 @@ endif
|
|
|
|
|
|
fullinstall:
|
|
|
ifndef EXCLUDE_80BIT_TARGETS
|
|
|
- $(MAKE) $(addsuffix _exe_install,$(filter-out $(PPC_TARGET),$(CYCLETARGETS))) $(addsuffix _all,$(TARGET_DIRS))
|
|
|
+ $(MAKE) $(addsuffix _exe_install,$(filter-out $(PPC_TARGET),$(CYCLETARGETS)))
|
|
|
else
|
|
|
- $(MAKE) $(addsuffix _exe_install,$(filter-out i8086,$(filter-out i386,$(filter-out $(PPC_TARGET),$(CYCLETARGETS))))) $(addsuffix _all,$(TARGET_DIRS))
|
|
|
+ $(MAKE) $(addsuffix _exe_install,$(filter-out i8086,$(filter-out i386,$(filter-out $(PPC_TARGET),$(CYCLETARGETS)))))
|
|
|
endif
|
|
|
+ $(MAKE) $(addsuffix _all,$(TARGET_DIRS))
|
|
|
$(MAKE) $(addsuffix _install,$(TARGET_DIRS))
|
|
|
|
|
|
auxfilesinstall:
|
|
@@ -1114,13 +1116,14 @@ endif
|
|
|
|
|
|
# This also installs a link from bin to the actual executable.
|
|
|
# The .deb does that later.
|
|
|
-installsymlink: install
|
|
|
+installsymlink: exeinstall
|
|
|
ifneq ($(PPCCPULOCATION),$(INSTALL_BINDIR))
|
|
|
$(MKDIR) $(INSTALL_BINDIR)
|
|
|
ln -sf $(INSTALL_BASEDIR)/$(EXENAME) $(INSTALL_BINDIR)/$(EXENAME)
|
|
|
endif
|
|
|
|
|
|
-fullinstallsymlink: fullinstall
|
|
|
+fullinstallsymlink:
|
|
|
+ $(ECHO) "Fullinstall finished, starting XXX_symlink_install"
|
|
|
ifndef EXCLUDE_80BIT_TARGETS
|
|
|
$(MAKE) $(addsuffix _symlink_install,$(filter-out $(PPC_TARGET),$(CYCLETARGETS)))
|
|
|
else
|