From 88589fb99d4b12450a982445d52c9590a5893a31 Mon Sep 17 00:00:00 2001
From: florian <florian@freepascal.org>
Date: Sun, 21 Oct 2018 14:52:21 +0000
Subject: [PATCH] * make install shall not make assumptions about FPC, if one
 was provided

git-svn-id: trunk@40007 -
---
 compiler/Makefile     | 4 ++++
 compiler/Makefile.fpc | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/compiler/Makefile b/compiler/Makefile
index f59913ef77..a2ab7cbf57 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -4528,7 +4528,11 @@ endif
 	$(INSTALL) $(MSGFILES) $(MSGINSTALLDIR)
 endif
 install: 
+ifndef FPC
 	$(MAKE) quickinstall auxfilesinstall FPC=$(BASEDIR)/$(INSTALLEXEFILE)
+else
+	$(MAKE) quickinstall auxfilesinstall
+endif
 installsymlink: install
 ifneq ($(PPCCPULOCATION),$(INSTALL_BINDIR))
 	$(MKDIR) $(INSTALL_BINDIR)
diff --git a/compiler/Makefile.fpc b/compiler/Makefile.fpc
index d20e962421..1a3f41fc05 100644
--- a/compiler/Makefile.fpc
+++ b/compiler/Makefile.fpc
@@ -921,7 +921,12 @@ endif
 	
 
 install: 
+# if no FPC is passed, use that one we assume, we just build
+ifndef FPC
 	$(MAKE) quickinstall auxfilesinstall FPC=$(BASEDIR)/$(INSTALLEXEFILE)
+else
+	$(MAKE) quickinstall auxfilesinstall
+endif
 
 # This also installs a link from bin to the actual executable.
 # The .deb does that later.