paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-15 23:49:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: trunk@40007 -
This commit is contained in:
florian 2018-10-21 14:52:21 +00:00
parent 02e03cbd86
commit 88589fb99d
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/Makefile
View File

@ -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
compiler/Makefile.fpc
View File

@ -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.