aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-08-25 15:33:53 +0000
committerFrancois Pons <fpons@mandriva.com>2000-08-25 15:33:53 +0000
commit6e0d2fff13c6ae9b97ca9e32c28c09bd2e2e8f67 (patch)
treed163d814b8d8966d1e5cc9b12965f92fb01d1f40
parentf8b245f06572634f7b7ad20dfb91736b10da7343 (diff)
downloadrpmtools-6e0d2fff13c6ae9b97ca9e32c28c09bd2e2e8f67.tar
rpmtools-6e0d2fff13c6ae9b97ca9e32c28c09bd2e2e8f67.tar.gz
rpmtools-6e0d2fff13c6ae9b97ca9e32c28c09bd2e2e8f67.tar.bz2
rpmtools-6e0d2fff13c6ae9b97ca9e32c28c09bd2e2e8f67.tar.xz
rpmtools-6e0d2fff13c6ae9b97ca9e32c28c09bd2e2e8f67.zip
*** empty log message ***
-rw-r--r--Makefile4
-rw-r--r--rpmtools.pm4
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 5894726..f2b4327 100644
--- a/Makefile
+++ b/Makefile
@@ -16,8 +16,8 @@ all: $(ALL)
install: $(ALL)
install -d $(PREFIX)/usr/bin
install -s $(ALL) $(PREFIX)/usr/bin
- install genhdlist_cz2 genhdlists genfilelist packdrake $(PREFIX)/usr/bin
- $(MAKE) -f Makefile_core $@
+ install genhdlist_cz2 genhdlists genbasefiles genfilelist packdrake $(PREFIX)/usr/bin
+ $(MAKE) -f Makefile_core PREFIX=$(PREFIX)/usr $@
$(FROMCC): %: %.cc
$(CXX) $(CFLAGS) $< $(LIBRPM) -o $@
diff --git a/rpmtools.pm b/rpmtools.pm
index a892ea3..115cece 100644
--- a/rpmtools.pm
+++ b/rpmtools.pm
@@ -81,8 +81,8 @@ sub compute_depslist {
#- this could be nothing if the provides is a file not found.
#- and this has been fixed above.
foreach (@$req) {
- my $info = $params->{info}{$_}; $info or next;
- $required_packages{$_} = undef;
+ my $info = $params->{info}{$_};
+ $required_packages{$_} = undef; $info or next;
if ($info->{deps} && !$info->{requires}) {
#- the package has been read from an ordered depslist file, and need
#- to rebuild its requires tags, so it can safely be used here.