From fa3684d7f61824462cc16eff9734a9efb36ae61e Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Mon, 1 Mar 2004 09:40:21 +0000 Subject: adapt to perl packages rebuilt --- rescue/list | 2 +- tools/Makefile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rescue/list b/rescue/list index 13ac32c3a..596d37047 100644 --- a/rescue/list +++ b/rescue/list @@ -128,7 +128,7 @@ /usr/lib/perl5/PERL_VERSION/warnings.pm /usr/lib/perl5/PERL_VERSION/Carp.pm /usr/lib/perl5/PERL_VERSION/Exporter.pm -/usr/lib/perl5/vendor_perl/5.8.2/packdrake.pm +/usr/lib/perl5/vendor_perl/PERL_VERSION/packdrake.pm /usr/bin/lspci /usr/share/pci.ids /usr/bin/lspcidrake diff --git a/tools/Makefile b/tools/Makefile index 557b7e52f..77fe14016 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -24,9 +24,9 @@ install: @install make_mdkinst_stage2 $(ROOTDEST)/misc @cd /usr/bin ; install packdrake $(ROOTDEST)/misc || { echo "packdrake is missing"; exit 1; } @cd /usr/bin ; install gendistrib rpm2header $(ROOTDEST)/misc || { echo "install rpmtools first!" ; exit 1; } - @eval `perl -V:installvendorlib | sed s/5.8../5.8.2/`; cd $$installvendorlib ; cp -rf packdrake.pm $(ROOTDEST)/misc || { echo "install rpmtools first!" ; exit 1; } - @eval `perl -V:installvendorarch | sed s/5.8../5.8.2/`; cd $$installvendorarch ; cp -rf URPM* $(ROOTDEST)/misc || { echo "install perl-URPM first!" ; exit 1; } - @eval `perl -V:installvendorarch | sed s/5.8../5.8.2/`; cd $$installvendorarch/auto ; cp -rf URPM $(ROOTDEST)/misc/auto || { echo "install perl-URPM first!" ; exit 1; } + @eval `perl -V:installvendorlib | sed s/5.8../5.8.3/`; cd $$installvendorlib ; cp -rf packdrake.pm $(ROOTDEST)/misc || { echo "install rpmtools first!" ; exit 1; } + @eval `perl -V:installvendorarch | sed s/5.8../5.8.3/`; cd $$installvendorarch ; cp -rf URPM* $(ROOTDEST)/misc || { echo "install perl-URPM first!" ; exit 1; } + @eval `perl -V:installvendorarch | sed s/5.8../5.8.3/`; cd $$installvendorarch/auto ; cp -rf URPM $(ROOTDEST)/misc/auto || { echo "install perl-URPM first!" ; exit 1; } @mkdir -p $(DEST)/usr/bin xhost+: %: %.c -- cgit v1.2.1