cleanups and make sure openpkg index uses the own tools

openpkg-tool/openpkg-build.pl

@@ -1,5 +1,5 @@
 ##
-##  openpkg-build -- create build scripts from package index
+##  openpkg-build.pl -- create build scripts from package index
 ##
 ##  Copyright (c) 2000-2002 Cable & Wireless Deutschland GmbH
 ##  Copyright (c) 2000-2002 The OpenPKG Project <http://www.openpkg.org/>

openpkg-tool/openpkg-index.pl

@@ -1,5 +1,5 @@
 ##
-##  openpkg-index -- create index from spec files
+##  openpkg-index.pl -- create index from spec files
 ##
 ##  Copyright (c) 2000-2002 Cable & Wireless Deutschland GmbH
 ##  Copyright (c) 2000-2002 The OpenPKG Project <http://www.openpkg.org/>
@@ -35,9 +35,10 @@ use vars qw/$opt_r $opt_p $opt_C $opt_o $opt_c $opt_i/;
 use FileHandle;
 use DirHandle;
 
-my $RPM = 'rpm';
-my $R2C = 'rpm2cpio';
-my $BZ  = 'bzip2 -9';
+my $l_prefix = "@l_prefix@";
+my $RPM = "$l_prefix/bin/rpm";
+my $R2C = "$l_prefix/bin/rpm2cpio";
+my $BZ  = "$l_prefix/lib/openpkg/bzip2 -9";
 
 #########################################################################
 

openpkg-tool/openpkg-tool.spec

@@ -32,8 +32,8 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [EVAL]
 Group:        Bootstrapping
 License:      GPL
-Version:      20021126
-Release:      20021126
+Version:      20021127
+Release:      20021127
 
 #   list of sources
 Source0:      openpkg.sh
@@ -73,9 +73,11 @@ AutoReqProv:  no
         -e 's;@version@;%{version};g' \
         %{SOURCE openpkg.1} $RPM_BUILD_ROOT%{l_prefix}/man/man1/
     %{l_shtool} install -c -m 755 \
+        -e 's;@l_prefix@;%{l_prefix};g' \
         %{SOURCE openpkg-index.pl} \
         $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/
     %{l_shtool} install -c -m 755 \
+        -e 's;@l_prefix@;%{l_prefix};g' \
         %{SOURCE openpkg-build.pl} \
         $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \