add support for directly finding local tool copies

openpkg/openpkg.spec

@@ -39,8 +39,8 @@
 #   o any cc(1)
 
 #   the package version and release
-%define       V_openpkg 20020625
-%define       R_openpkg 20020625
+%define       V_openpkg 20020714
+%define       R_openpkg 20020714
 
 #   the used software versions
 %define       V_rpm     4.0.2

openpkg/rpmmacros

@@ -139,7 +139,7 @@
 %l_bash                  %{l_prefix}/lib/openpkg/bash
 
 #   provide smart paths to tools
-%l_tool_locate()         %(if [ ".%{expand:%%{?with_%1}}" != . ]; then tool="%{expand:%%{with_%1}}"; elif [ -f "%{l_bindir}/%1" ]; then tool="%{l_bindir}/%1"; else tool="%1"; fi; echo $tool)
+%l_tool_locate()         %(if [ ".%{expand:%%{?with_%1}}" != . ]; then tool="%{expand:%%{with_%1}}"; elif [ -f "%{l_bindir}/%1" ]; then tool="%{l_bindir}/%1"; elif [ -f "%{l_prefix}/lib/openpkg/%1" ]; then tool="%{l_prefix}/lib/openpkg/%1"; else tool="%1"; fi; echo $tool)
 %l_gzip                  %{l_tool_locate gzip}
 %l_bzip2                 %{l_tool_locate bzip2}
 %l_tar                   %{l_tool_locate tar}