summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-08-05 20:08:04 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-08-05 20:08:04 +0000
commitafe74f656565e3505878a5f2673b51823203bcff (patch)
tree5262d49f8c0edb390276aecf06f83c2bdb39e173
parentcbb14fa41aa61e834c2ee472c58164bc43eb87dd (diff)
downloaddrakx-afe74f656565e3505878a5f2673b51823203bcff.tar
drakx-afe74f656565e3505878a5f2673b51823203bcff.tar.gz
drakx-afe74f656565e3505878a5f2673b51823203bcff.tar.bz2
drakx-afe74f656565e3505878a5f2673b51823203bcff.tar.xz
drakx-afe74f656565e3505878a5f2673b51823203bcff.zip
packdrake.pm is now in vendorlib
-rw-r--r--perl-install/share/list2
-rw-r--r--tools/Makefile3
2 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/share/list b/perl-install/share/list
index ee74cc277..6dda35f83 100644
--- a/perl-install/share/list
+++ b/perl-install/share/list
@@ -105,6 +105,7 @@
/usr/lib/perl5/PERL_VERSION/Net/FTP/I.pm
/usr/lib/perl5/PERL_VERSION/Net/FTP/dataconn.pm
/usr/lib/perl5/PERL_VERSION/Net/Netrc.pm
+/usr/lib/perl5/vendor_perl/PERL_VERSION/packdrake.pm
/usr/lib/perl5/vendor_perl/PERL_VERSION/MDK/Common/DataStructure.pm
/usr/lib/perl5/vendor_perl/PERL_VERSION/MDK/Common/File.pm
/usr/lib/perl5/vendor_perl/PERL_VERSION/MDK/Common/Func.pm
@@ -117,7 +118,6 @@
/usr/lib/perl5/vendor_perl/PERL_VERSION/ARCH-linux/URPM.pm
/usr/lib/perl5/vendor_perl/PERL_VERSION/ARCH-linux/URPM/Resolve.pm
/usr/lib/perl5/vendor_perl/PERL_VERSION/ARCH-linux/auto/URPM/URPM.so
-/usr/lib/perl5/vendor_perl/PERL_VERSION/ARCH-linux/packdrake.pm
/usr/lib/perl5/vendor_perl/PERL_VERSION/ARCH-linux/Gtk.pm
/usr/lib/perl5/vendor_perl/PERL_VERSION/ARCH-linux/Gtk/Types.pm
/usr/lib/perl5/vendor_perl/PERL_VERSION/ARCH-linux/Gtk/Gdk/ImlibImage.pm
diff --git a/tools/Makefile b/tools/Makefile
index e632cc1e3..244b23bd9 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -24,7 +24,8 @@ 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:installvendorarch`; cd $$installvendorarch ; cp -rf packdrake.pm URPM* $(ROOTDEST)/misc || { echo "install rpmtools and perl-URPM first!" ; exit 1; }
+ @eval `perl -V:installvendorlib`; cd $$installvendorlib ; cp -rf packdrake.pm $(ROOTDEST)/misc || { echo "install rpmtools first!" ; exit 1; }
+ @eval `perl -V:installvendorarch`; cd $$installvendorarch ; cp -rf URPM* $(ROOTDEST)/misc || { echo "install perl-URPM first!" ; exit 1; }
@eval `perl -V:installvendorarch`; cd $$installvendorarch/auto ; cp -rf URPM $(ROOTDEST)/misc/auto || { echo "install perl-URPM first!" ; exit 1; }
@mkdir -p $(DEST)/usr/bin