Browse Source

* make install shall not make assumptions about FPC, if one was provided

git-svn-id: trunk@40007 -
florian 6 years ago
parent
commit
88589fb99d
2 changed files with 9 additions and 0 deletions
  1. 4 0
      compiler/Makefile
  2. 5 0
      compiler/Makefile.fpc

+ 4 - 0
compiler/Makefile

@@ -4528,7 +4528,11 @@ endif
 	$(INSTALL) $(MSGFILES) $(MSGINSTALLDIR)
 	$(INSTALL) $(MSGFILES) $(MSGINSTALLDIR)
 endif
 endif
 install: 
 install: 
+ifndef FPC
 	$(MAKE) quickinstall auxfilesinstall FPC=$(BASEDIR)/$(INSTALLEXEFILE)
 	$(MAKE) quickinstall auxfilesinstall FPC=$(BASEDIR)/$(INSTALLEXEFILE)
+else
+	$(MAKE) quickinstall auxfilesinstall
+endif
 installsymlink: install
 installsymlink: install
 ifneq ($(PPCCPULOCATION),$(INSTALL_BINDIR))
 ifneq ($(PPCCPULOCATION),$(INSTALL_BINDIR))
 	$(MKDIR) $(INSTALL_BINDIR)
 	$(MKDIR) $(INSTALL_BINDIR)

+ 5 - 0
compiler/Makefile.fpc

@@ -921,7 +921,12 @@ endif
 	
 	
 
 
 install: 
 install: 
+# if no FPC is passed, use that one we assume, we just build
+ifndef FPC
 	$(MAKE) quickinstall auxfilesinstall FPC=$(BASEDIR)/$(INSTALLEXEFILE)
 	$(MAKE) quickinstall auxfilesinstall FPC=$(BASEDIR)/$(INSTALLEXEFILE)
+else
+	$(MAKE) quickinstall auxfilesinstall
+endif
 
 
 # This also installs a link from bin to the actual executable.
 # This also installs a link from bin to the actual executable.
 # The .deb does that later.
 # The .deb does that later.