mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-08-16 23:19:24 +02:00
* search for gtar first
git-svn-id: trunk@2600 -
This commit is contained in:
parent
ee1ef7d207
commit
f4738689ba
5
Makefile
5
Makefile
@ -1104,12 +1104,17 @@ endif
|
|||||||
endif
|
endif
|
||||||
export ZIPPROG
|
export ZIPPROG
|
||||||
ifndef TARPROG
|
ifndef TARPROG
|
||||||
|
TARPROG:=$(strip $(wildcard $(addsuffix /gtar$(SRCEXEEXT),$(SEARCHPATH))))
|
||||||
|
ifeq ($(TARPROG),)
|
||||||
TARPROG:=$(strip $(wildcard $(addsuffix /tar$(SRCEXEEXT),$(SEARCHPATH))))
|
TARPROG:=$(strip $(wildcard $(addsuffix /tar$(SRCEXEEXT),$(SEARCHPATH))))
|
||||||
ifeq ($(TARPROG),)
|
ifeq ($(TARPROG),)
|
||||||
TARPROG= __missing_command_TARPROG
|
TARPROG= __missing_command_TARPROG
|
||||||
else
|
else
|
||||||
TARPROG:=$(firstword $(TARPROG))
|
TARPROG:=$(firstword $(TARPROG))
|
||||||
endif
|
endif
|
||||||
|
else
|
||||||
|
TARPROG:=$(firstword $(TARPROG))
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
export TARPROG
|
export TARPROG
|
||||||
ASNAME=$(BINUTILSPREFIX)as
|
ASNAME=$(BINUTILSPREFIX)as
|
||||||
|
@ -612,7 +612,7 @@ implementation
|
|||||||
AddTool('PPUMOVE','ppumove','');
|
AddTool('PPUMOVE','ppumove','');
|
||||||
AddTool('FPCMAKE','fpcmake','');
|
AddTool('FPCMAKE','fpcmake','');
|
||||||
AddTool('ZIPPROG','zip','');
|
AddTool('ZIPPROG','zip','');
|
||||||
AddTool('TARPROG','tar','');
|
AddTool('TARPROG','gtar','tar');
|
||||||
AddIniSection('defaulttools');
|
AddIniSection('defaulttools');
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user