cleanup more shtool usages

openpkg/HISTORY

@@ -2,6 +2,7 @@
 2004
 ====
 
+20041002 cleanup more shtool usages
 20040928 fix broken shtool usage introduced in 20040924
 20040924 remove the beecrypt C++ preprocessor configure test
 20040923 fix building of cURL under at least FreeBSD 5.3.

openpkg/openpkg.spec

@@ -39,7 +39,7 @@
 #   o any cc(1)
 
 #   the package version/release
-%define       V_openpkg  20040928
+%define       V_openpkg  20041002
 
 #   the used software versions
 %define       V_rpm      4.2.1
@@ -638,7 +638,7 @@ Provides:     OpenPKG
 
     #   build cURL tool
     ( cd curl-%{V_curl}
-      %{l_prefix}/lib/openpkg/shtool subst \
+      sh $shtool subst \
           -e '/LINENO: error: C\+\+ preprocessor/{N;N;N;N;s/.*/:/;}' \
           configure
       ( echo 'ac_cv_header_openssl_engine_h=no'
@@ -1063,7 +1063,7 @@ Provides:     OpenPKG
         mkdir $RPM_BUILD_ROOT%{l_prefix}/etc/openpkg
 
     #   install platform identification file
-    sh `SOURCE shtool` platform -n -L -S "" -C "+" -F "%<ap>-any-%<sp>" \
+    sh $shtool platform -n -L -S "" -C "+" -F "%<ap>-any-%<sp>" \
         >$RPM_BUILD_ROOT%{l_prefix}/etc/openpkg/platform
     chmod 644 $RPM_BUILD_ROOT%{l_prefix}/etc/openpkg/platform