mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-09-08 09:23:48 +02:00
* merged from 1.0.x branch
This commit is contained in:
parent
cd494453ca
commit
823b0277bc
File diff suppressed because it is too large
Load Diff
@ -111,7 +111,7 @@ ifndef FPC_VERSION
|
|||||||
FPC_VERSION:=$(shell $(FPC) -iV)
|
FPC_VERSION:=$(shell $(FPC) -iV)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION FPCOPT
|
export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
|
||||||
|
|
||||||
|
|
||||||
[fpcdircheckenv]
|
[fpcdircheckenv]
|
||||||
@ -1273,9 +1273,7 @@ ifdef USETAR
|
|||||||
cd $(PACKDIR) ; $(TARPROG) cf$(TAROPT) $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT) * ; cd $(BASEDIR)
|
cd $(PACKDIR) ; $(TARPROG) cf$(TAROPT) $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT) * ; cd $(BASEDIR)
|
||||||
else
|
else
|
||||||
$(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT)
|
$(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT)
|
||||||
cd $(PACKDIR)
|
cd $(PACKDIR) ; $(ZIPPROG) -Dr $(ZIPOPT) $(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT) * ; cd $(BASEDIR)
|
||||||
$(ZIPPROG) -Dr $(ZIPOPT) $(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT) *
|
|
||||||
cd $(BASEDIR)
|
|
||||||
endif
|
endif
|
||||||
$(DELTREE) $(PACKDIR)
|
$(DELTREE) $(PACKDIR)
|
||||||
endif
|
endif
|
||||||
|
Loading…
Reference in New Issue
Block a user