summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-03-04 14:04:17 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-03-04 14:04:17 +0000
commita37fbc44bac2b5a2ad48e93e4445f02f54b24b0e (patch)
tree0f11261a8f67096d9e9bef396544f9129972d2c7 /perl-install
parente333524e77a1cabf18df3ac66af7942be210ea0f (diff)
downloaddrakx-a37fbc44bac2b5a2ad48e93e4445f02f54b24b0e.tar
drakx-a37fbc44bac2b5a2ad48e93e4445f02f54b24b0e.tar.gz
drakx-a37fbc44bac2b5a2ad48e93e4445f02f54b24b0e.tar.bz2
drakx-a37fbc44bac2b5a2ad48e93e4445f02f54b24b0e.tar.xz
drakx-a37fbc44bac2b5a2ad48e93e4445f02f54b24b0e.zip
enable exception managment even at install time (installer set $::no_ugtk_init)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/ugtk2.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm
index 1b25aa25f..11e6a6c4b 100644
--- a/perl-install/ugtk2.pm
+++ b/perl-install/ugtk2.pm
@@ -48,8 +48,8 @@ unless ($::no_ugtk_init) {
Gtk2->init;
c::bind_textdomain_codeset($_, 'UTF8') foreach 'libDrakX', @::textdomains;
$::need_utf8_i18n = 1;
- Gtk2->croak_execeptions if 0.95 < $Gtk2::VERSION;
}
+Gtk2->croak_execeptions if (!$::no_ugtk_init || $::isInstall) && 0.95 < $Gtk2::VERSION ;
$border = 5;
"hl opt">/po/DrakX.pot # force rebuild of po's [ ! -e $@/Makefile ] || $(MAKE) -C $@ install: mkdir -p $(BINDEST) $(ETCDEST) $(SBINDEST) $(DATADIR)/{harddrake,pixmaps,icons/{large,mini},autostart} $(BINX11DEST) $(LIBX11DEST) $(PIXDIR) $(INITDIR) $(MENUDIR) install -d $(INLIBDEST_DIRS:%=$(LIBDEST)/%) install $(STANDALONEPMS) standalone/service_harddrake.sh standalone/convert $(SBINDEST) install -s rpcinfo-flushed serial_probe/serial_probe $(SBINDEST) ln -s ../../$(patsubst $(PREFIX)/usr%,%,$(SBINDEST))/XFdrake $(BINX11DEST)/Xdrakres ln -s fileshareset $(SBINDEST)/filesharelist mv -f $(SBINDEST)/lsnetdrake $(BINDEST) mv -f $(SBINDEST)/drakbug $(BINDEST) mv -f $(SBINDEST)/drakhelp $(BINDEST) mv -f $(SBINDEST)/localedrake $(BINDEST) mv -f $(SBINDEST)/net_applet $(BINDEST) install -m 644 *.pm $(LIBDEST) for i in $(PMS_DIRS); do install -d $(LIBDEST)/$$i ; install -m 644 $$i/*.pm $(LIBDEST)/$$i/;done install -m 644 pixmaps/*.* $(PIXDIR) install -m 644 share/diskdrake.rc $(DATADIR)/$(NAME) install -d $(PREFIX)/etc/security echo 'RESTRICT=yes' > $(PREFIX)/etc/security/fileshare.conf install -D standalone/finish-install.xsetup $(PREFIX)/etc/X11/xsetup.d/finish-install.xsetup install -d $(PREFIX)/etc/sysconfig echo 'FINISH_INSTALL=yes' > $(PREFIX)/etc/sysconfig/finish-install for i in $(HAVEINST_DIRS); do \ $(MAKE) -C $$i install PREFIX=$(PREFIX) SUDO= DATADIR=$(DATADIR) NAME=$(NAME) ; \ done find auto -follow -name .exists -o -name "*.bs" | xargs rm -f cp -rfL auto standalone/icons $(LIBDEST) mv $(LIBDEST)/icons/harddrake2/menu/harddrake-menu32.png $(ICONSDIR)/harddrake.png mv $(LIBDEST)/icons/harddrake2/menu/harddrake-menu48.png $(ICONSDIR)/large/harddrake.png mv $(LIBDEST)/icons/harddrake2/menu/harddrake-menu16.png $(ICONSDIR)/mini/harddrake.png mv $(LIBDEST)/icons/localedrake-32.png $(ICONSDIR)/localedrake.png mv $(LIBDEST)/icons/localedrake-48.png $(ICONSDIR)/large/localedrake.png mv $(LIBDEST)/icons/localedrake-16.png $(ICONSDIR)/mini/localedrake.png rmdir $(LIBDEST)/icons/harddrake2/menu mv $(LIBDEST)/icons/harddrake2/ $(DATADIR)/pixmaps/ mv $(SBINDEST)/service_harddrake.sh $(INITDIR)/harddrake mv $(SBINDEST)/convert $(DATADIR)/harddrake mv $(SBINDEST)/service_harddrake $(DATADIR)/harddrake/ ln -s {XFdrake,$(SBINDEST)/drakx11} ln -s {diskdrake,$(SBINDEST)/drakdisk} ln -s {drakclock,$(SBINDEST)/clock.pl} ln -s {harddrake2,$(SBINDEST)/drakhardware} ln -s {keyboarddrake,$(SBINDEST)/drakkeyboard} ln -s {localedrake,$(BINDEST)/draklocale} ln -s {logdrake,$(SBINDEST)/draklog} ln -s {mousedrake,$(SBINDEST)/drakmouse} ln -s {net_monitor,$(SBINDEST)/draknet_monitor} ln -s {printerdrake,$(SBINDEST)/drakprinter} ln -s {scannerdrake,$(SBINDEST)/drakscanner} mkdir -p $(PREFIX)/usr/share/man/man{5,8} for i in 5 8; do install -m 644 standalone/man/C/man$$i/* $(PREFIX)/usr/share/man/man$$i; done