add convinience macros %l_rc and %l_rpm; resolve conflict with openpkg-rc package

openpkg/HISTORY

@@ -2,6 +2,7 @@
 2003
 ====
 
+20030714 add convinience macros %l_rc and %l_rpm; resolve conflict with openpkg-rc package
 20030714 bugfix verbose output; add "rc" command to search path for run-command sections
 20030710 rename openpkg_runall to openpkg_rc_all, support new openpkg_rc_def.
 20030709 fully work-off rc script

openpkg/rc

@@ -26,8 +26,8 @@
 
 #   provide hook for "openpkg-rc" package which contains the
 #   new OSSP rc implementation as a replacement for this script.
-if [ -f @l_prefix@/lib/openpkg/rc ]; then
-    exec @l_prefix@/lib/openpkg/rc ${1+"$@"}
+if [ -f @l_prefix@/lib/openpkg/rcng ]; then
+    exec @l_prefix@/lib/openpkg/rcng ${1+"$@"}
 fi
 
 #   program name, version and date

openpkg/rpmmacros

@@ -133,6 +133,8 @@
 %_tarbin                 %{l_prefix}/lib/openpkg/tar
 
 #   provide fixed paths to tools (additional)
+%l_rc                    %{l_prefix}/etc/rc
+%l_rpm                   %{l_prefix}/bin/rpm
 %l_rpmtool               %{l_prefix}/lib/openpkg/rpmtool
 %l_shtool                %{l_prefix}/lib/openpkg/shtool
 %l_curl                  %{l_prefix}/lib/openpkg/curl