summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-12-16 19:30:55 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-12-16 19:30:55 +0000
commitc930e6cc7e11b72ab1786f209dffb49a11bea8f7 (patch)
tree0bc6f4be7493c333f87ae7f8cf6252870805d3db
parentc3822da244887ef19b2ef7bba5812d18bc6ea8db (diff)
downloaddrakx-backup-do-not-use-c930e6cc7e11b72ab1786f209dffb49a11bea8f7.tar
drakx-backup-do-not-use-c930e6cc7e11b72ab1786f209dffb49a11bea8f7.tar.gz
drakx-backup-do-not-use-c930e6cc7e11b72ab1786f209dffb49a11bea8f7.tar.bz2
drakx-backup-do-not-use-c930e6cc7e11b72ab1786f209dffb49a11bea8f7.tar.xz
drakx-backup-do-not-use-c930e6cc7e11b72ab1786f209dffb49a11bea8f7.zip
fix daminetsex
-rw-r--r--perl-install/Makefile.config2
-rw-r--r--perl-install/Makefile.drakxtools1
-rw-r--r--perl-install/any.pm4
3 files changed, 3 insertions, 4 deletions
diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config
index 3b3608a0e..958e7214f 100644
--- a/perl-install/Makefile.config
+++ b/perl-install/Makefile.config
@@ -5,7 +5,7 @@ VERSION = 2.2.10-BOOT
SUDO = sudo
SO_FILES = c/blib/arch/auto/c/c.so
PMS = *.pm Newt/*.pm c/stuff.pm resize_fat/*.pm sbus_probing/*.pm commands install2 g_auto_install live_install live_install2
-STANDALONEPMS= diskdrake XFdrake mousedrake lspcidrake printerdrake keyboarddrake netdrake draknet drakxconf drakxservices draksec drakboot adduserdrake rpmdrake drakgw livedrake
+STANDALONEPMS= diskdrake XFdrake mousedrake printerdrake keyboarddrake netdrake draknet drakxconf drakxservices draksec drakboot adduserdrake rpmdrake drakgw livedrake
PMS += $(STANDALONEPMS:%=standalone/%)
REP4PMS = /usr/bin/perl-install
ROOTDEST = /export
diff --git a/perl-install/Makefile.drakxtools b/perl-install/Makefile.drakxtools
index f21df531e..6e443ed38 100644
--- a/perl-install/Makefile.drakxtools
+++ b/perl-install/Makefile.drakxtools
@@ -24,7 +24,6 @@ install:
install -d $(BINDEST) $(ETCDEST) $(SBINDEST) $(DATADIR) $(LIBDEST) $(BINX11DEST) $(LIBX11DEST) $(LIBDEST)/po $(DIRS:%=$(LIBDEST)/%)
install -d $(LIBDEST)/sbus_probing
install $(STANDALONEPMS) $(SBINDEST)
- mv -f $(SBINDEST)/lspcidrake $(BINDEST)
install -s ddcprobe/ddcxinfos serial_probe/serial_probe $(SBINDEST)
ln -s ../../$(patsubst $(PREFIX)/usr%,%,$(SBINDEST))/XFdrake $(BINX11DEST)/Xdrakres
diff --git a/perl-install/any.pm b/perl-install/any.pm
index be1ff5e28..3c6d8d624 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -490,7 +490,7 @@ sub setup_thiskind {
my ($in, $type, $auto, $at_least_one) = @_;
return if arch() eq "ppc";
- my @l=setup_thiskind_backend ($type, $auto, $at_least_one, sub { my $w = wait_load_module($in, $type, @_) } );
+ my @l = setup_thiskind_backend ($type, $auto, $at_least_one, sub { my $w = wait_load_module($in, $type, @_) } );
if (!$::noauto) {
if (my @err = grep { $_ } map { $_->{error} } @l) {
@@ -533,7 +533,7 @@ sub setup_thiskind_backend {
my @l;
if (!$::noauto) {
@l = modules::load_thiskind($type, $wait_function );
- return @l if $auto && (@l || !$at_least_one);
+ return @l;# DAMS SUCKERY if $auto && (@l || !$at_least_one);
}
}