summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-09-14 15:24:08 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-09-14 15:24:08 +0000
commit9019611d95da1c18d6fc7d96d9e2b588cf8a8b28 (patch)
tree325acf4908195be47c768232e7aa4eeb99df113b
parent01c972efbcc020faabd5905c3abeabf1ed016cc2 (diff)
downloaddrakx-9019611d95da1c18d6fc7d96d9e2b588cf8a8b28.tar
drakx-9019611d95da1c18d6fc7d96d9e2b588cf8a8b28.tar.gz
drakx-9019611d95da1c18d6fc7d96d9e2b588cf8a8b28.tar.bz2
drakx-9019611d95da1c18d6fc7d96d9e2b588cf8a8b28.tar.xz
drakx-9019611d95da1c18d6fc7d96d9e2b588cf8a8b28.zip
no_comment
-rw-r--r--perl-install/Makefile2
-rw-r--r--perl-install/install_any.pm6
2 files changed, 5 insertions, 3 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile
index e54857f50..4ae205f52 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -175,7 +175,7 @@ stage2:
$(SUDO) mount $(STAGE2) /mnt/stage2 -o loop
# hack to reduce the STAGE2 image
- rm $(STAGE2TMP)/usr/X11R6/bin/XF86_SVGA
+ rm $(STAGE2TMP)/usr/X11R6/bin/XF86_VGA16
for i in /usr/share/locale /usr/share/keymaps /usr/share/xmodmap; do \
name=`basename $$i` ; \
(cd $(STAGE2TMP)/$$i ; find * | cpio -o 2>/dev/null | bzip2 > ../$$name.cpio.bz2 ; cd .. ; rm -rf $$name) \
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 79c41bfa6..e40c800fe 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -24,8 +24,10 @@ use log;
#- Functions
#-######################################################################################
sub relGetFile($) {
- local $_ = member($_[0], qw(compss compssList depslist hdlist)) ? "base" : "RPMS";
- $_ = "Mandrake/$_/$_[0]";
+ local $_ = $_[0];
+ my $dir = m|/| ? "mdkinst" :
+ (member($_, qw(compss compssList depslist hdlist)) ? "base" : "RPMS");
+ $_ = "Mandrake/$dir/$_";
s/i386/i586/;
$_;
}