paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-11-19 16:19:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

* fixed double zip options

Browse Source 
* fixed / between zipname and zipext
  * fixed auto ppas exec when -s is in compiler options
This commit is contained in:
peter 2000-01-18 20:55:59 +00:00
parent ed72ca92c6
commit 101d1561c2
2 changed files with 198 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

366
utils/fpcmake.inc
View File

File diff suppressed because it is too large Load Diff

26
utils/fpcmake.ini
View File

@ -288,13 +288,6 @@ PPAS=ppas.bat
endif endif
endif endif
# also call ppas if with command option -s
ifeq (,$(findstring -s ,$(COMPILER)))
EXECPPAS=
else
EXECPPAS:=@$(PPAS)
endif
# ldconfig to rebuild .so cache # ldconfig to rebuild .so cache
ifdef inlinux ifdef inlinux
LDCONFIG=ldconfig LDCONFIG=ldconfig
@ -439,7 +432,7 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
ifeq ($(ZIPPROG),) ifeq ($(ZIPPROG),)
ZIPPROG= ZIPPROG=
else else
ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r ZIPPROG:=$(firstword $(ZIPPROG))
endif endif
endif endif
export ZIPPROG export ZIPPROG
@ -828,6 +821,13 @@ endif
# Compiler commandline # Compiler commandline
override COMPILER:=$(FPC) $(FPCOPT) override COMPILER:=$(FPC) $(FPCOPT)
# also call ppas if with command option -s
ifeq (,$(findstring -s ,$(COMPILER)))
EXECPPAS=
else
EXECPPAS:=@$(PPAS)
endif
[standardrules] [standardrules]
##################################################################### #####################################################################
@ -954,19 +954,19 @@ fpc_debug:
%$(PPUEXT): %.pp %$(PPUEXT): %.pp
$(COMPILER) $< $(REDIR) $(COMPILER) $< $(REDIR)
$(EXECPASS) $(EXECPPAS)
%$(PPUEXT): %.pas %$(PPUEXT): %.pas
$(COMPILER) $< $(REDIR) $(COMPILER) $< $(REDIR)
$(EXECPASS) $(EXECPPAS)
%$(EXEEXT): %.pp %$(EXEEXT): %.pp
$(COMPILER) $< $(REDIR) $(COMPILER) $< $(REDIR)
$(EXECPASS) $(EXECPPAS)
%$(EXEEXT): %.pas %$(EXEEXT): %.pas
$(COMPILER) $< $(REDIR) $(COMPILER) $< $(REDIR)
$(EXECPASS) $(EXECPPAS)
[libraryrules] [libraryrules]
@ -1131,7 +1131,7 @@ ifdef USETAR
$(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT) $(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT)
cd $(PACKDIR) ; $(TARPROG) c$(TAROPT) --file $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT) * ; cd $(BASEDIR) cd $(PACKDIR) ; $(TARPROG) c$(TAROPT) --file $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT) * ; cd $(BASEDIR)
else else
$(DEL) $(DESTZIPDIR)/$(ZIPNAME)/$(ZIPEXT) $(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 endif
$(DELTREE) $(PACKDIR) $(DELTREE) $(PACKDIR)