* merged from 1.0.x branch

This commit is contained in:
peter 2000-12-19 21:20:14 +00:00
parent cd494453ca
commit 823b0277bc
2 changed files with 320 additions and 322 deletions

File diff suppressed because it is too large Load Diff

View File

@ -111,7 +111,7 @@ ifndef FPC_VERSION
FPC_VERSION:=$(shell $(FPC) -iV)
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]
@ -1273,9 +1273,7 @@ ifdef USETAR
cd $(PACKDIR) ; $(TARPROG) cf$(TAROPT) $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT) * ; cd $(BASEDIR)
else
$(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT)
cd $(PACKDIR)
$(ZIPPROG) -Dr $(ZIPOPT) $(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT) *
cd $(BASEDIR)
cd $(PACKDIR) ; $(ZIPPROG) -Dr $(ZIPOPT) $(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT) * ; cd $(BASEDIR)
endif
$(DELTREE) $(PACKDIR)
endif