paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-20 21:09:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ Fixes from peter for fpc.exe merged

Browse Source
This commit is contained in:
michael 2000-11-29 15:33:43 +00:00
parent b9796f6a7f
commit f2ba7392fc
2 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
compiler/Makefile
View File

@ -1,5 +1,5 @@
#
# Makefile generated by fpcmake v1.00 [2000/10/27]
# Makefile generated by fpcmake v1.00 [2000/10/12]
#
defaultrule: all
@ -354,7 +354,7 @@ endif
# To install files
ifndef INSTALL
ifdef inUnix
INSTALL:=install -c -m 644
INSTALL:=install -m 644
else
INSTALL:=$(COPY)
endif
@ -363,7 +363,7 @@ endif
# To install programs
ifndef INSTALLEXE
ifdef inUnix
INSTALLEXE:=install -c -m 755
INSTALLEXE:=install -m 755
else
INSTALLEXE:=$(COPY)
endif
@ -1212,7 +1212,7 @@ else
$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
ifdef USETAR
$(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT)
cd $(PACKDIR) ; $(TARPROG) cf$(TAROPT) $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT) * ; cd $(BASEDIR)
cd $(PACKDIR) ; $(TARPROG) c$(TAROPT) --file $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT) * ; cd $(BASEDIR)
else
$(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT)
cd $(PACKDIR) ; $(ZIPPROG) -Dr $(ZIPOPT) $(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT) * ; cd $(BASEDIR)
@ -1578,6 +1578,8 @@ cvstest:
.PHONY: quickinstall install installsym
MSGINSTALLDIR=$(BASEINSTALLDIR)/msg
override FPCEXEFILE:=$(wildcard $(FPCEXE))
override PPEXEFILE:=$(wildcard $(EXENAME))
# This will only install the ppc386.exe, not the message files etc.
quickinstall:
@ -1585,13 +1587,25 @@ quickinstall:
ifdef UPXPROG
-$(UPXPROG) $(EXENAME)
endif
$(INSTALLEXE) $(FPCEXE) $(BININSTALLDIR)
# Install fpc.exe
ifneq ($(FPCEXEFILE),)
ifdef UPXPROG
-$(UPXPROG) $(FPCEXEFILE)
endif
$(INSTALLEXE) $(FPCEXEFILE) $(BININSTALLDIR)
endif
# Install ppc386.exe
ifneq ($(PPEXEFILE),)
ifdef UPXPROG
-$(UPXPROG) $(EXENAME)
endif
ifdef UNIXINSTALLDIR
$(MKDIR) $(BASEINSTALLDIR)
$(INSTALLEXE) $(EXENAME) $(BASEINSTALLDIR)
else
$(INSTALLEXE) $(EXENAME) $(BININSTALLDIR)
endif
endif
install: quickinstall
ifdef UNIXINSTALLDIR
@ -1633,4 +1647,4 @@ localmake:=$(strip $(wildcard makefile.loc))
ifdef localmake
include ./$(localmake)
endif
endif

17
compiler/Makefile.fpc
View File

@ -329,20 +329,33 @@ cvstest:
.PHONY: quickinstall install installsym
MSGINSTALLDIR=$(BASEINSTALLDIR)/msg
override FPCEXEFILE:=$(wildcard $(FPCEXE))
override PPEXEFILE:=$(wildcard $(EXENAME))
# This will only install the ppc386.exe, not the message files etc.
quickinstall:
$(MKDIR) $(BININSTALLDIR)
# Install fpc.exe
ifneq ($(FPCEXEFILE),)
ifdef UPXPROG
-$(UPXPROG) $(FPCEXEFILE)
endif
$(MKDIR) $(BININSTALLDIR)
$(INSTALLEXE) $(FPCEXEFILE) $(BININSTALLDIR)
endif
# Install ppc386.exe
ifneq ($(PPEXEFILE),)
ifdef UPXPROG
-$(UPXPROG) $(EXENAME)
endif
$(INSTALLEXE) $(FPCEXE) $(BININSTALLDIR)
ifdef UNIXINSTALLDIR
$(MKDIR) $(BASEINSTALLDIR)
$(INSTALLEXE) $(EXENAME) $(BASEINSTALLDIR)
else
$(MKDIR) $(BININSTALLDIR)
$(INSTALLEXE) $(EXENAME) $(BININSTALLDIR)
endif
endif
install: quickinstall
ifdef UNIXINSTALLDIR
@ -384,4 +397,4 @@ localmake:=$(strip $(wildcard makefile.loc))
ifdef localmake
include ./$(localmake)
endif
endif