Changeset 692 for trunk/kBuild/tools/TAR.kmk

Timestamp:

Dec 8, 2006, 11:31:16 PM (19 years ago)

Author:

bird

Message:

tools location is being cleaned up.

File:

• trunk/kBuild/tools/TAR.kmk (modified) (1 diff)

trunk/kBuild/tools/TAR.kmk

@@ -28 +28 @@
 
 # Tool Specific Properties
-ifndef TOOL_TAR_UNPACK
- TOOL_TAR_UNPACK := $(wildcard $(PATH_DEVTOOLS_BLD)/tar$(HOSTSUFF_EXE))
- ifeq ($(TOOL_TAR_UNPACK),)
-  TOOL_TAR_UNPACK := tar$(HOSTSUFF_EXE)
+ifndef TOOL_TAR_TAR
+ TOOL_TAR_TAR := $(wildcard $(PATH_DEVTOOLS_BLD)/tar/v*/tar$(HOSTSUFF_EXE))
+ ifeq ($(TOOL_TAR_TAR),)
+  TOOL_TAR_TAR := $(wildcard $(PATH_DEVTOOLS_BLD)/bin/tar$(HOSTSUFF_EXE))
+ endif
+ ifeq ($(TOOL_TAR_TAR),)
+  TOOL_TAR_TAR := $(lastword $(sort $(TOOL_TAR_TAR)))
+ else
+  TOOL_TAR_TAR := tar$(HOSTSUFF_EXE)
  endif
 else
- TOOL_TAR_UNPACK := $(TOOL_TAR_UNPACK)
+ TOOL_TAR_TAR := $(TOOL_TAR_TAR)
 endif
+TOOL_TAR_UNPACK ?= $(TOOL_TAR_TAR)
 
 # General Properties used by kBuild