Browse Source

* use the built compiler to install files, so the version is set correctly

git-svn-id: trunk@40006 -
florian 6 years ago
parent
commit
02e03cbd86
2 changed files with 9 additions and 4 deletions
  1. 3 1
      compiler/Makefile
  2. 6 3
      compiler/Makefile.fpc

+ 3 - 1
compiler/Makefile

@@ -4518,7 +4518,7 @@ 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))))) $(addsuffix _all,$(TARGET_DIRS))
 endif
 endif
 	$(MAKE) $(addsuffix _install,$(TARGET_DIRS))
 	$(MAKE) $(addsuffix _install,$(TARGET_DIRS))
-install: quickinstall
+auxfilesinstall:
 ifndef CROSSINSTALL
 ifndef CROSSINSTALL
 ifdef UNIXHier
 ifdef UNIXHier
 	$(MKDIR) $(INSTALL_BASEDIR)
 	$(MKDIR) $(INSTALL_BASEDIR)
@@ -4527,6 +4527,8 @@ endif
 	$(MKDIR) $(MSGINSTALLDIR)
 	$(MKDIR) $(MSGINSTALLDIR)
 	$(INSTALL) $(MSGFILES) $(MSGINSTALLDIR)
 	$(INSTALL) $(MSGFILES) $(MSGINSTALLDIR)
 endif
 endif
+install: 
+	$(MAKE) quickinstall auxfilesinstall FPC=$(BASEDIR)/$(INSTALLEXEFILE)
 installsymlink: install
 installsymlink: install
 ifneq ($(PPCCPULOCATION),$(INSTALL_BINDIR))
 ifneq ($(PPCCPULOCATION),$(INSTALL_BINDIR))
 	$(MKDIR) $(INSTALL_BINDIR)
 	$(MKDIR) $(INSTALL_BINDIR)

+ 6 - 3
compiler/Makefile.fpc

@@ -908,9 +908,8 @@ 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))))) $(addsuffix _all,$(TARGET_DIRS))
 endif
 endif
         $(MAKE) $(addsuffix _install,$(TARGET_DIRS))
         $(MAKE) $(addsuffix _install,$(TARGET_DIRS))
-	
-
-install: quickinstall
+        
+auxfilesinstall:
 ifndef CROSSINSTALL
 ifndef CROSSINSTALL
 ifdef UNIXHier
 ifdef UNIXHier
         $(MKDIR) $(INSTALL_BASEDIR)
         $(MKDIR) $(INSTALL_BASEDIR)
@@ -919,6 +918,10 @@ endif
         $(MKDIR) $(MSGINSTALLDIR)
         $(MKDIR) $(MSGINSTALLDIR)
         $(INSTALL) $(MSGFILES) $(MSGINSTALLDIR)
         $(INSTALL) $(MSGFILES) $(MSGINSTALLDIR)
 endif
 endif
+	
+
+install: 
+	$(MAKE) quickinstall auxfilesinstall FPC=$(BASEDIR)/$(INSTALLEXEFILE)
 
 
 # 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.