summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-07-13 12:15:44 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-07-13 12:15:44 +0000
commit7a0f1c3eea57413de17756e30eece4018224dec2 (patch)
treef27e7e991f11078943e5340c04952e53c8246f02 /perl-install
parent5d7866bc867a4a048d9e917a7d26e9189feacd0d (diff)
downloaddrakx-7a0f1c3eea57413de17756e30eece4018224dec2.tar
drakx-7a0f1c3eea57413de17756e30eece4018224dec2.tar.gz
drakx-7a0f1c3eea57413de17756e30eece4018224dec2.tar.bz2
drakx-7a0f1c3eea57413de17756e30eece4018224dec2.tar.xz
drakx-7a0f1c3eea57413de17756e30eece4018224dec2.zip
no_comment
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/Makefile30
-rw-r--r--perl-install/install_steps_auto_install.pm3
-rw-r--r--perl-install/install_steps_gtk.pm3
3 files changed, 19 insertions, 17 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile
index 0c4226668..299a34b85 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -88,22 +88,20 @@ ifeq (sparc,$(ARCH))
endif
for i in `cat /tmp/list`; do \
- if [ -e $$i ]; then \
- if (echo $$i | grep -q "lib/[^/]*\.so"); then \
- install -s $$i $(DEST)/lib; \
- else \
- d=$$i; \
- (echo $$d | grep -q "^[^/]") && d="$(REP4PMS)/$$d"; \
- d=`echo $(DEST)/$$d | sed 's/\/usr\/local\//\/usr\//'`; \
- install -d `dirname $$d` && \
- if (echo $$i | grep -q "\.pm"); then \
- perl -pe '$$_ =~ /^__END__/ and exit(0);' $$i > $$d; \
- elif (echo $$i | grep -q "\.so"); then \
- install -s $$i $$d; \
- else \
- cp -f $$i $$d; \
- fi; \
- fi; \
+ if (echo $$i | grep -q "lib/[^/]*\.so"); then \
+ install -s $$i $(DEST)/lib; \
+ else \
+ d=$$i; \
+ (echo $$d | grep -q "^[^/]") && d="$(REP4PMS)/$$d"; \
+ d=`echo $(DEST)/$$d | sed 's/\/usr\/local\//\/usr\//'`; \
+ install -d `dirname $$d` && \
+ if (echo $$i | grep -q "\.pm"); then \
+ perl -pe '$$_ =~ /^__END__/ and exit(0);' $$i > $$d; \
+ elif (echo $$i | grep -q "\.so"); then \
+ install -s $$i $$d; \
+ else \
+ cp -f $$i $$d; \
+ fi; \
fi; \
done
mv -f $(DEST)/lib/libimlib-png.so $(DEST)/usr/lib
diff --git a/perl-install/install_steps_auto_install.pm b/perl-install/install_steps_auto_install.pm
index 71aac7080..8f92edb49 100644
--- a/perl-install/install_steps_auto_install.pm
+++ b/perl-install/install_steps_auto_install.pm
@@ -6,6 +6,9 @@ use vars qw(@ISA);
@ISA = qw(install_steps);
+use modules;
+
+
#-######################################################################################
#- misc imports
#-######################################################################################
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index c4751a9d9..7595fd5e9 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -767,10 +767,11 @@ sub create_steps_window {
$pixmap->signal_connect(enter_notify_event => sub { print "HERE\n" });
if ($step->{reachable}) {
- my $button = new Gtk::Button
+ my $button = new Gtk::Button;
$button->set_relief('none');
gtksignal_connect(gtkadd($button, $b), clicked => sub { die "setstep $step_name\n" });
$button;
+ }
} grep {
!eval $o->{steps}{$_}{hidden};
} @{$o->{orderedSteps}}),