Fix search and replace for __WIZ_HOME__ and fix wrongly committed files

27 files changed, 139 insertions, 135 deletions

diff --git a/Makefile b/Makefile
index b4fd267f..11913748 100644
--- a/Makefile
+++ b/Makefile
@@ -19,16 +19,20 @@ WIZ =	common\
 	data\
 	po
 
+all:
+
+
 # installs all the wizards...
 
 install:
-	find -regex ".*\.wiz$$\|.*.pm$$\|.*\.sh$$" -exec \
-		perl -pi -e "s|__WIZ_HOME__|/usr/share/wizards|g" \{\} \;
 	mkdir -p ${prefix}/sbin
 	install -p drakwizard.pl ${prefix}/sbin/drakwizard
 	for l in $(WIZ); do \
 		$(MAKE) -C $$l $@; \
 	done
+	find  ${prefix}/share/wizards -regex ".*\.wiz$$\|.*.pm$$\|.*\.sh$$" -exec \
+		perl -pi -e "s|__WIZ_HOME__|/usr/share/wizards|g" \{\} \;
+
 
 clean:
 	$(MAKE) -C po $@
diff --git a/client_wizard/client.wiz b/client_wizard/client.wiz
index a1cceb86..0bb0317d 100644
--- a/client_wizard/client.wiz
+++ b/client_wizard/client.wiz
@@ -3,11 +3,11 @@
 
 <Wizard
 	name="general"
-	libScript="/usr/share/wizards/common/scripts/functions.sh"
+	libScript="__WIZ_HOME__/common/scripts/functions.sh"
 	wizardTitle="Client wizard"
 	imagePosition="top"
-	defaultImage="/usr/share/wizards/client_wizard/images/DNS"
-	perlModule="/usr/share/wizards/client_wizard/scripts/Clientconf.pm"
+	defaultImage="__WIZ_HOME__/client_wizard/images/DNS"
+	perlModule="__WIZ_HOME__/client_wizard/scripts/Clientconf.pm"
 >
 
 	<Variable
@@ -25,7 +25,7 @@
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz.html"
 		name="Welcome"
-		jumpScript="/usr/share/wizards/common/scripts/check.sh root wiz_ip_net"
+		jumpScript="__WIZ_HOME__/common/scripts/check.sh root wiz_ip_net"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -81,7 +81,7 @@
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz.html"
 		name="CLIENT"
-		jumpScript="/usr/share/wizards/client_wizard/scripts/test_client.sh"
+		jumpScript="__WIZ_HOME__/client_wizard/scripts/test_client.sh"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -193,7 +193,7 @@
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz.html"
 		name="error_need_net"
-		subWizard="/usr/share/wizards/server_wizard/server.wiz"
+		subWizard="__WIZ_HOME__/server_wizard/server.wiz"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="false"
diff --git a/client_wizard/scripts/Clientconf.pm b/client_wizard/scripts/Clientconf.pm
index d481bbce..6917eda3 100644
--- a/client_wizard/scripts/Clientconf.pm
+++ b/client_wizard/scripts/Clientconf.pm
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 package Clientconf;
-require "/usr/share/wizards/common/scripts/Vareqval.pm";
+require "__WIZ_HOME__/common/scripts/Vareqval.pm";
 use MDK::Common;
 use strict;
 
diff --git a/common/scripts/DrakconnectConf.pm b/common/scripts/DrakconnectConf.pm
index c85f0c35..80ddbbfb 100644
--- a/common/scripts/DrakconnectConf.pm
+++ b/common/scripts/DrakconnectConf.pm
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 package DrakconnectConf;
-require "/usr/share/wizards/common/scripts/Vareqval.pm";
+require "__WIZ_HOME__/common/scripts/Vareqval.pm";
 use strict;
 
 my	$file = "/etc/sysconfig/network-scripts/drakconnect_conf";
diff --git a/db_wizard/db.wiz b/db_wizard/db.wiz
index c529cd42..8fff8105 100644
--- a/db_wizard/db.wiz
+++ b/db_wizard/db.wiz
@@ -3,10 +3,10 @@
 
 <Wizard
 	name="general"
-	libScript="/usr/share/wizards/common/scripts/functions.sh"
+	libScript="__WIZ_HOME__/common/scripts/functions.sh"
 	wizardTitle="MySQL Database wizard"
 	imagePosition="top"
-	defaultImage="/usr/share/wizards/db_wizard/images/SQL"
+	defaultImage="__WIZ_HOME__/db_wizard/images/SQL"
 	rpm="MySQL"
 >
 
@@ -34,7 +34,7 @@
 
 	<Page
 		name="welcome"
-		jumpScript="/usr/share/wizards/common/scripts/check.sh root wiz_ip_net"
+		jumpScript="__WIZ_HOME__/common/scripts/check.sh root wiz_ip_net"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -92,7 +92,7 @@
 
 	<Page
 		name="error_need_net"
-		subWizard="/usr/share/wizards/server_wizard/server.wiz"
+		subWizard="__WIZ_HOME__/server_wizard/server.wiz"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="false"
@@ -169,7 +169,7 @@
 
 	<Page
 		name="confirmation"
-		jumpScript="/usr/share/wizards/db_wizard/scripts/root_passwd.sh"
+		jumpScript="__WIZ_HOME__/db_wizard/scripts/root_passwd.sh"
 		jumpPage="adduser"
 		nextButtonText="Confirm"
 		executionLevel="NORMAL"
@@ -209,7 +209,7 @@ needed to configure your MySQL Database Server"
 	<Page
 		name="adduser"
 		nextButtonText="Add"
-		jumpScript="/usr/share/wizards/db_wizard/scripts/add_user.sh"
+		jumpScript="__WIZ_HOME__/db_wizard/scripts/add_user.sh"
 		jumpPage="congratulations"
 		executionLevel="NORMAL"
 		nextFinish="false"
diff --git a/dhcp_wizard/dhcp.wiz b/dhcp_wizard/dhcp.wiz
index a5f3d939..f253fc86 100644
--- a/dhcp_wizard/dhcp.wiz
+++ b/dhcp_wizard/dhcp.wiz
@@ -3,11 +3,11 @@
 
 <Wizard
 	name="general"
-	libScript="/usr/share/wizards/common/scripts/functions.sh"
+	libScript="__WIZ_HOME__/common/scripts/functions.sh"
 	wizardTitle="DHCP Wizard"
 	imagePosition="top"
-	defaultImage="/usr/share/wizards/dhcp_wizard/images/DHCP"
-	perlModule="/usr/share/wizards/dhcp_wizard/scripts/Dhcpconf.pm"
+	defaultImage="__WIZ_HOME__/dhcp_wizard/images/DHCP"
+	perlModule="__WIZ_HOME__/dhcp_wizard/scripts/Dhcpconf.pm"
 	rpm="dhcp-server"
 >
 
@@ -30,7 +30,7 @@
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-dhcp.html"
 		name="welcome"
-		jumpScript="/usr/share/wizards/common/scripts/check.sh root wiz_ip_net"
+		jumpScript="__WIZ_HOME__/common/scripts/check.sh root wiz_ip_net"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -76,7 +76,7 @@
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-dhcp.html"
 		name="ask_dhcp_ip_range"
 		comment="Ask the dhcp ip range"
-		jumpScript="/usr/share/wizards/dhcp_wizard/check_range.sh"
+		jumpScript="__WIZ_HOME__/dhcp_wizard/check_range.sh"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -110,7 +110,7 @@
 		<Freetext
 			name="dhcpIpLow"
 			variableName="dhcp_range_low"
-			fillScript="/usr/share/wizards/dhcp_wizard/compute_range1.sh"
+			fillScript="__WIZ_HOME__/dhcp_wizard/compute_range1.sh"
 			helpText="Lowest IP Address:"
 			editable="true"
 		>
@@ -119,7 +119,7 @@
 		<Freetext
 			name="dhcpIpHigh"
 			variableName="dhcp_range_high"
-			fillScript="/usr/share/wizards/dhcp_wizard/compute_range2.sh"
+			fillScript="__WIZ_HOME__/dhcp_wizard/compute_range2.sh"
 			helpText="Highest IP Address:"
 			editable="true"
 		>
@@ -152,7 +152,7 @@
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-dhcp.html"
 		name="doit"
-		jumpScript="/usr/share/wizards/dhcp_wizard/do_it_dhcp.sh"
+		jumpScript="__WIZ_HOME__/dhcp_wizard/do_it_dhcp.sh"
 		nextButtonText="Configure"
 		executionLevel="NORMAL"
 		nextFinish="false"
@@ -249,7 +249,7 @@ needed to configure your DHCP service:"
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-dhcp.html"
 		name="error_need_net"
-		subWizard="/usr/share/wizards/server_wizard/server.wiz"
+		subWizard="__WIZ_HOME__/server_wizard/server.wiz"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="false"
diff --git a/dhcp_wizard/scripts/Dhcpconf.pm b/dhcp_wizard/scripts/Dhcpconf.pm
index 4b508565..3a3a3e8d 100644
--- a/dhcp_wizard/scripts/Dhcpconf.pm
+++ b/dhcp_wizard/scripts/Dhcpconf.pm
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 package Dhcpconf;
-require "/usr/share/wizards/common/scripts/Vareqval.pm";
+require "__WIZ_HOME__/common/scripts/Vareqval.pm";
 use MDK::Common;
 use strict;
 
@@ -66,7 +66,7 @@ sub	do_it {
 	die "can't make a temp file: $!";
     open(NEW, "> $tmp")	or
 	die "can't open $tmp: $!";
-    open(OLD, "< /usr/share/wizards/dhcp_wizard/scripts/dhcpd.conf.default") or
+    open(OLD, "< __WIZ_HOME__/dhcp_wizard/scripts/dhcpd.conf.default") or
 	die "can't open default: $!";
     while (<OLD>) {
 	s|__hname__|$wiz_host_name|g;
diff --git a/dns_wizard/dns.wiz b/dns_wizard/dns.wiz
index 2c986df0..f7b9f68c 100644
--- a/dns_wizard/dns.wiz
+++ b/dns_wizard/dns.wiz
@@ -3,11 +3,11 @@
 
 <Wizard
 	name="general"
-	libScript="/usr/share/wizards/common/scripts/functions.sh"
+	libScript="__WIZ_HOME__/common/scripts/functions.sh"
 	wizardTitle="DNS Wizard"
 	imagePosition="top"
-	defaultImage="/usr/share/wizards/dns_wizard/images/DNS"
-	perlModule="/usr/share/wizards/dns_wizard/scripts/Dnsconf.pm"
+	defaultImage="__WIZ_HOME__/dns_wizard/images/DNS"
+	perlModule="__WIZ_HOME__/dns_wizard/scripts/Dnsconf.pm"
 >
 
 	<Variable
@@ -27,7 +27,7 @@
 	<Page
 		name="Welcome"
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-dns.html"
-		jumpScript="/usr/share/wizards/common/scripts/check.sh root wiz_ip_net"
+		jumpScript="__WIZ_HOME__/common/scripts/check.sh root wiz_ip_net"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -73,7 +73,7 @@
 	<Page
 		name="DNS"
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-dns.html"
-		jumpScript="/usr/share/wizards/dns_wizard/scripts/check_ext_dns.sh"
+		jumpScript="__WIZ_HOME__/dns_wizard/scripts/check_ext_dns.sh"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -206,7 +206,7 @@
 	<Page
 		name="error_need_net"
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-dns.html"
-		subWizard="/usr/share/wizards/server_wizard/server.wiz"
+		subWizard="__WIZ_HOME__/server_wizard/server.wiz"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="false"
diff --git a/dns_wizard/scripts/Dnsconf.pm b/dns_wizard/scripts/Dnsconf.pm
index 59ffee9b..f5a00abb 100644
--- a/dns_wizard/scripts/Dnsconf.pm
+++ b/dns_wizard/scripts/Dnsconf.pm
@@ -1,8 +1,8 @@
 #!/usr/bin/perl
 
 package Dnsconf;
-require "/usr/share/wizards/common/scripts/Vareqval.pm";
-require "/usr/share/wizards/common/scripts/DrakconnectConf.pm";
+require "__WIZ_HOME__/common/scripts/Vareqval.pm";
+require "__WIZ_HOME__/common/scripts/DrakconnectConf.pm";
 use MDK::Common;
 use strict;
 use standalone;
@@ -39,7 +39,7 @@ sub	do_it {
     my $file = "/etc/host.conf";
     
     MDK::Common::cp_af($file, $file.".orig");
-    MDK::Common::cp_af("/usr/share/wizards/dns_wizard/scripts/host.conf.default", $file);
+    MDK::Common::cp_af("__WIZ_HOME__/dns_wizard/scripts/host.conf.default", $file);
     
     $file = "/etc/named.conf";
     MDK::Common::cp_af($file, $file.".orig");
@@ -56,14 +56,14 @@ sub	do_it {
 	s|__revnet__|$reversnet|g;
 	s|__net__|$s_trunc|g;
 	$_;
-    } cat_("/usr/share/wizards/dns_wizard/scripts/named.conf.default"));
+    } cat_("__WIZ_HOME__/dns_wizard/scripts/named.conf.default"));
 # Bug fix for bind 9:
     if (! -f "/etc/rndc.key") { system("touch /etc/rndc.key") or die "can not touch /etc/rndc.key"};
 
 # root.hints
     $file="/var/named/root.hints";
     -f $file and MDK::Common::cp_af($file, $file . ".orig");
-    MDK::Common::cp_af("/usr/share/wizards/dns_wizard/scripts/root.hints.default", $file);
+    MDK::Common::cp_af("__WIZ_HOME__/dns_wizard/scripts/root.hints.default", $file);
 
 # 127.0.0.rev
     $file="/var/named/127.0.0.rev";
@@ -71,7 +71,7 @@ sub	do_it {
     output($file, map {
 	s|__hname__|$wiz_host_name|g;
 	$_;
-    } cat_("/usr/share/wizards/dns_wizard/scripts/127.0.0.rev.default"));
+    } cat_("__WIZ_HOME__/dns_wizard/scripts/127.0.0.rev.default"));
     up_serial($file);
     
 # $ipnet.rev
@@ -83,7 +83,7 @@ sub	do_it {
 	s|__revnet__|$reversnet|g;
 	s|__nb__|$ds|g;
 	$_;
-    } cat_("/usr/share/wizards/dns_wizard/scripts/ipnet.rev.default"));
+    } cat_("__WIZ_HOME__/dns_wizard/scripts/ipnet.rev.default"));
     up_serial($file);
     
 # $domain.db
@@ -96,7 +96,7 @@ sub	do_it {
 	s|__host__|$host|g;
 	s|__nb__|$ds|g;
 	$_;
-    } cat_("/usr/share/wizards/dns_wizard/scripts/domain.db.default"));
+    } cat_("__WIZ_HOME__/dns_wizard/scripts/domain.db.default"));
     up_serial($file);
 
 #resolv.conf
diff --git a/firewall_wizard/firewall.wiz b/firewall_wizard/firewall.wiz
index bd9b6084..ba689abd 100644
--- a/firewall_wizard/firewall.wiz
+++ b/firewall_wizard/firewall.wiz
@@ -3,11 +3,11 @@
 
 <Wizard
 	name="general"
-	libScript="/usr/share/wizards/common/scripts/functions.sh"
+	libScript="__WIZ_HOME__/common/scripts/functions.sh"
 	wizardTitle="Firewall wizard"
 	imagePosition="top"
-	defaultImage="/usr/share/wizards/firewall_wizard/images/firewall"
-	perlModule="/usr/share/wizards/firewall_wizard/scripts/FWconf.pm"
+	defaultImage="__WIZ_HOME__/firewall_wizard/images/firewall"
+	perlModule="__WIZ_HOME__/firewall_wizard/scripts/FWconf.pm"
 >
 
 	<Variable
@@ -29,7 +29,7 @@
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-firewall.html"
 		name="Welcome"
-		jumpScript="/usr/share/wizards/common/scripts/check.sh root wiz_ip_net"
+		jumpScript="__WIZ_HOME__/common/scripts/check.sh root wiz_ip_net"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -149,7 +149,7 @@
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-firewall.html"
 		name="choose_net_device"
-		jumpScript="/usr/share/wizards/firewall_wizard/check_ext_device.sh"
+		jumpScript="__WIZ_HOME__/firewall_wizard/check_ext_device.sh"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -183,8 +183,8 @@
 		<Chooser
 			name="deviceChooser"
 			variableName="firewallDevice"
-			defaultOptionScript="/usr/share/wizards/firewall_wizard/compute_ext_device.sh"
-			fillScript="/usr/share/wizards/firewall_wizard/liste_ext_device.sh"
+			defaultOptionScript="__WIZ_HOME__/firewall_wizard/compute_ext_device.sh"
+			fillScript="__WIZ_HOME__/firewall_wizard/liste_ext_device.sh"
 			helpText="Device"
 			helpFontName="Default"
 			helpFontStyle="plain"
@@ -249,7 +249,7 @@ needed to configure your firewall:"
 
 		<Freetext
 			name="freetext"
-			fillScript="/usr/share/wizards/firewall_wizard/compute_level_name.sh"
+			fillScript="__WIZ_HOME__/firewall_wizard/compute_level_name.sh"
 			helpText="Protection Level:"
 			editable="false"
 		>
@@ -329,7 +329,7 @@ needed to configure your firewall:"
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-firewall.html"
 		name="error_need_net"
-		subWizard="/usr/share/wizards/server_wizard/server.wiz"
+		subWizard="__WIZ_HOME__/server_wizard/server.wiz"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="false"
diff --git a/firewall_wizard/scripts/FWconf.pm b/firewall_wizard/scripts/FWconf.pm
index 31c0f23c..87ecc226 100644
--- a/firewall_wizard/scripts/FWconf.pm
+++ b/firewall_wizard/scripts/FWconf.pm
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 package FWconf;
-require "/usr/share/wizards/common/scripts/Vareqval.pm";
+require "__WIZ_HOME__/common/scripts/Vareqval.pm";
 use MDK::Common;
 #use strict;
 
@@ -34,7 +34,7 @@ sub	do_it {
     
     store_fwall();
     
-    my %conf = ("/usr/share/wizards/firewall_wizard/scripts/bastille-firewall.cfg.default" =>
+    my %conf = ("__WIZ_HOME__/firewall_wizard/scripts/bastille-firewall.cfg.default" =>
 		"/etc/Bastille/bastille-firewall.cfg",
 		"/usr/share/Bastille/bastille-firewall" => "/etc/init.d/bastille-firewall",
 		"/usr/share/Bastille/bastille_ipchains" => "/sbin/bastille-ipchains",
diff --git a/ftp_wizard/ftp.wiz b/ftp_wizard/ftp.wiz
index 1903b3ec..113c2518 100644
--- a/ftp_wizard/ftp.wiz
+++ b/ftp_wizard/ftp.wiz
@@ -3,11 +3,11 @@
 
 <Wizard
 	name="general"
-	libScript="/usr/share/wizards/common/scripts/functions.sh"
+	libScript="__WIZ_HOME__/common/scripts/functions.sh"
 	wizardTitle="FTP wizard"
 	imagePosition="top"
-	defaultImage="/usr/share/wizards/ftp_wizard/images/FTP"
-	perlModule="/usr/share/wizards/ftp_wizard/scripts/ProFtpconf.pm"
+	defaultImage="__WIZ_HOME__/ftp_wizard/images/FTP"
+	perlModule="__WIZ_HOME__/ftp_wizard/scripts/ProFtpconf.pm"
 	rpm="proftpd"
 >
 
diff --git a/ftp_wizard/scripts/Ftpconf.pm b/ftp_wizard/scripts/Ftpconf.pm
index fdd05119..a2c57f04 100644
--- a/ftp_wizard/scripts/Ftpconf.pm
+++ b/ftp_wizard/scripts/Ftpconf.pm
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 package Ftpconf;
-require "/usr/share/wizards/common/scripts/Vareqval.pm";
+require "__WIZ_HOME__/common/scripts/Vareqval.pm";
 use MDK::Common;
 use strict;
 
diff --git a/ftp_wizard/scripts/ProFtpconf.pm b/ftp_wizard/scripts/ProFtpconf.pm
index 8954d356..ec596a88 100644
--- a/ftp_wizard/scripts/ProFtpconf.pm
+++ b/ftp_wizard/scripts/ProFtpconf.pm
@@ -1,10 +1,10 @@
 #!/usr/bin/perl
 
 package ProFtpconf;
-require "/usr/share/wizards/common/scripts/DrakconnectConf.pm";
+require "__WIZ_HOME__/common/scripts/DrakconnectConf.pm";
 use MDK::Common;
 use strict;
-require "/usr/share/wizards/common/scripts/Vareqval.pm";
+require "__WIZ_HOME__/common/scripts/Vareqval.pm";
 
 sub	true {
     my	($val) = @_;
diff --git a/news_wizard/news.wiz b/news_wizard/news.wiz
index 478c7c2e..497b0ce4 100644
--- a/news_wizard/news.wiz
+++ b/news_wizard/news.wiz
@@ -3,11 +3,11 @@
 
 <Wizard
 	name="general"
-	libScript="/usr/share/wizards/common/scripts/functions.sh"
+	libScript="__WIZ_HOME__/common/scripts/functions.sh"
 	wizardTitle="News Wizard"
 	imagePosition="top"
-	defaultImage="/usr/share/wizards/news_wizard/images/news"
-	perlModule="/usr/share/wizards/news_wizard/scripts/Newsconf.pm"
+	defaultImage="__WIZ_HOME__/news_wizard/images/news"
+	perlModule="__WIZ_HOME__/news_wizard/scripts/Newsconf.pm"
 >
 
 	<Variable
@@ -31,7 +31,7 @@
 	<Page
 		name="Welcome"
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-news.html"
-		jumpScript="/usr/share/wizards/common/scripts/check.sh root wiz_ip_net"
+		jumpScript="__WIZ_HOME__/common/scripts/check.sh root wiz_ip_net"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -71,7 +71,7 @@
 	<Page
 		name="ask_news_server"
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-news.html"
-		jumpScript="/usr/share/wizards/news_wizard/scripts/check_news_server.sh"
+		jumpScript="__WIZ_HOME__/news_wizard/scripts/check_news_server.sh"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -139,7 +139,7 @@
 	<Page
 		name="ask_news_freq"
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-news.html"
-		jumpScript="/usr/share/wizards/news_wizard/scripts/check_valid_hours.sh"
+		jumpScript="__WIZ_HOME__/news_wizard/scripts/check_valid_hours.sh"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -319,7 +319,7 @@ needed to configure your Internet News Service:"
 	<Page
 		name="error_need_net"
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-news.html"
-		subWizard="/usr/share/wizards/server_wizard/server.wiz"
+		subWizard="__WIZ_HOME__/server_wizard/server.wiz"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="false"
diff --git a/news_wizard/scripts/Newsconf.pm b/news_wizard/scripts/Newsconf.pm
index 158939c0..a0968891 100644
--- a/news_wizard/scripts/Newsconf.pm
+++ b/news_wizard/scripts/Newsconf.pm
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 package Newsconf;
-require "/usr/share/wizards/common/scripts/Vareqval.pm";
+require "__WIZ_HOME__/common/scripts/Vareqval.pm";
 use MDK::Common;
 use strict;
 
@@ -39,7 +39,7 @@ sub	do_it {
     if (! -f $file) { die "$file not found: $!"};
     my  $tmp = `mktemp /tmp/Newsconf.XXXXXX`
 	or die "can't make a temp file: $!";
-    open(OLD, "< /usr/share/wizards/news_wizard/scripts/config.default")
+    open(OLD, "< __WIZ_HOME__/news_wizard/scripts/config.default")
 	or die "can't open default: $!";
     open(NEW, "> $tmp")
 	or die "can't open $tmp: $!";
@@ -60,7 +60,7 @@ sub	do_it {
     my $file = "/etc/leafnode/crontab";
     my $tmp = `mktemp /tmp/Newsconf.XXXXXX`
 	or die "can't make a temp file: $!";
-    open(OLD, "< /usr/share/wizards/news_wizard/scripts/news.cron")
+    open(OLD, "< __WIZ_HOME__/news_wizard/scripts/news.cron")
 	or die "can't open default: $!";
     open(NEW, "> $tmp")
 	or die "can't open $tmp: $!";
diff --git a/postfix_wizard/postfix.wiz b/postfix_wizard/postfix.wiz
index 66715a05..c0930fa1 100644
--- a/postfix_wizard/postfix.wiz
+++ b/postfix_wizard/postfix.wiz
@@ -3,11 +3,11 @@
 
 <Wizard
 	name="general"
-	libScript="/usr/share/wizards/common/scripts/functions.sh"
+	libScript="__WIZ_HOME__/common/scripts/functions.sh"
 	wizardTitle="Postfix wizard"
 	imagePosition="top"
-	defaultImage="/usr/share/wizards/postfix_wizard/images/courrier"
-	perlModule="/usr/share/wizards/postfix_wizard/scripts/Postfixconf.pm"
+	defaultImage="__WIZ_HOME__/postfix_wizard/images/courrier"
+	perlModule="__WIZ_HOME__/postfix_wizard/scripts/Postfixconf.pm"
 	rpm="postfix"
 >
 
@@ -26,7 +26,7 @@
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-postfix.html"
 		name="welcome"
-		jumpScript="/usr/share/wizards/common/scripts/check.sh root wiz_ip_net"
+		jumpScript="__WIZ_HOME__/common/scripts/check.sh root wiz_ip_net"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -106,7 +106,7 @@
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-postfix.html"
 		name="Form_of_address"
-		jumpScript="/usr/share/wizards/postfix_wizard/scripts/check_masquerade.sh"
+		jumpScript="__WIZ_HOME__/postfix_wizard/scripts/check_masquerade.sh"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -172,7 +172,7 @@
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-postfix.html"
 		name="ISP"
-		jumpScript="/usr/share/wizards/postfix_wizard/scripts/check_relay.sh"
+		jumpScript="__WIZ_HOME__/postfix_wizard/scripts/check_relay.sh"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -282,7 +282,7 @@ needed to configure your Internet Mail Service:"
 
 		<Freetext
 			name="freetext1"
-			fillScript="(export wiz_ext_mail_relay=`/usr/share/wizards/postfix_wizard/scripts/compute_mail_relay.sh`; echo $wiz_ext_mail_relay)"
+			fillScript="(export wiz_ext_mail_relay=`__WIZ_HOME__/postfix_wizard/scripts/compute_mail_relay.sh`; echo $wiz_ext_mail_relay)"
 			helpText="Internet Mail Gateway"
 			editable="false"
 		>
@@ -290,7 +290,7 @@ needed to configure your Internet Mail Service:"
 
 		<Freetext
 			name="freetext2"
-			fillScript="(export wiz_mail_masquerade=`/usr/share/wizards/postfix_wizard/scripts/compute_masquerade.sh`; echo $wiz_mail_masquerade)"
+			fillScript="(export wiz_mail_masquerade=`__WIZ_HOME__/postfix_wizard/scripts/compute_masquerade.sh`; echo $wiz_mail_masquerade)"
 			helpText="Form of the Address"
 			editable="false"
 		>
@@ -327,7 +327,7 @@ needed to configure your Internet Mail Service:"
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-postfix.html"
 		name="error_need_net"
-		subWizard="/usr/share/wizards/server_wizard/server.wiz"
+		subWizard="__WIZ_HOME__/server_wizard/server.wiz"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="false"
diff --git a/postfix_wizard/scripts/Postfixconf.pm b/postfix_wizard/scripts/Postfixconf.pm
index 463cc85e..52cc13f2 100644
--- a/postfix_wizard/scripts/Postfixconf.pm
+++ b/postfix_wizard/scripts/Postfixconf.pm
@@ -1,8 +1,8 @@
 #!/usr/bin/perl
 
 package Postfixconf;
-require "/usr/share/wizards/common/scripts/Vareqval.pm";
-require "/usr/share/wizards/common/scripts/DrakconnectConf.pm";
+require "__WIZ_HOME__/common/scripts/Vareqval.pm";
+require "__WIZ_HOME__/common/scripts/DrakconnectConf.pm";
 use MDK::Common;
 use strict;
 
diff --git a/proxy_wizard/proxy.wiz b/proxy_wizard/proxy.wiz
index 4532209f..cd264303 100644
--- a/proxy_wizard/proxy.wiz
+++ b/proxy_wizard/proxy.wiz
@@ -3,11 +3,11 @@
 
 <Wizard
 	name="general"
-	libScript="/usr/share/wizards/common/scripts/functions.sh"
+	libScript="__WIZ_HOME__/common/scripts/functions.sh"
 	wizardTitle="Squid wizard"
 	imagePosition="top"
-	defaultImage="/usr/share/wizards/proxy_wizard/images/proxy"
-	perlModule="/usr/share/wizards/proxy_wizard/scripts/Squidconf.pm"
+	defaultImage="__WIZ_HOME__/proxy_wizard/images/proxy"
+	perlModule="__WIZ_HOME__/proxy_wizard/scripts/Squidconf.pm"
 	rpm="squid"
 >
 
@@ -86,7 +86,7 @@
 	<Page
 		name="Welcome"
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-proxy.html"
-		jumpScript="/usr/share/wizards/common/scripts/check.sh root wiz_ip_net"
+		jumpScript="__WIZ_HOME__/common/scripts/check.sh root wiz_ip_net"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -206,7 +206,7 @@
 	<Page
 		name="port"
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-proxy.html"
-		jumpScript="/usr/share/wizards/proxy_wizard/scripts/testport.sh"
+		jumpScript="__WIZ_HOME__/proxy_wizard/scripts/testport.sh"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -309,7 +309,7 @@
 
 		<Info
 			comment="free space on disk"
-			fillScript="/usr/share/wizards/proxy_wizard/scripts/dfh.sh"
+			fillScript="__WIZ_HOME__/proxy_wizard/scripts/dfh.sh"
 		>
 		</Info>
 
@@ -318,7 +318,7 @@
 	<Page
 		name="ask_level"
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-proxy.html"
-		jumpScript="/usr/share/wizards/proxy_wizard/scripts/echolevel.sh $wiz_squid_level"
+		jumpScript="__WIZ_HOME__/proxy_wizard/scripts/echolevel.sh $wiz_squid_level"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -412,7 +412,7 @@
 
 
 		<Info
-			fillScript="/usr/share/wizards/proxy_wizard/scripts/printservices.sh"
+			fillScript="__WIZ_HOME__/proxy_wizard/scripts/printservices.sh"
 		>
 		</Info>
 
@@ -463,7 +463,7 @@
 	<Page
 		name="cachepeer"
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-proxy.html"
-		jumpScript="/usr/share/wizards/proxy_wizard/scripts/echolevel.sh $wiz_squid_menupeer"
+		jumpScript="__WIZ_HOME__/proxy_wizard/scripts/echolevel.sh $wiz_squid_menupeer"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -624,7 +624,7 @@
 
 		<Freetext
 			name="s_level"
-			fillScript="/usr/share/wizards/proxy_wizard/scripts/showlevel.sh $wiz_squid_level"
+			fillScript="__WIZ_HOME__/proxy_wizard/scripts/showlevel.sh $wiz_squid_level"
 			helpText="Access Control:"
 			editable="false"
 		>
@@ -716,7 +716,7 @@
 		<Freetext
 			name="s_level"
 			variableName="wiz_squid_mynetw"
-			fillScript="/usr/share/wizards/proxy_wizard/scripts/showlevel.sh $wiz_squid_level"
+			fillScript="__WIZ_HOME__/proxy_wizard/scripts/showlevel.sh $wiz_squid_level"
 			helpText="Access Control:"
 			editable="false"
 		>
@@ -820,7 +820,7 @@
 	<Page
 		name="error_need_net"
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-proxy.html"
-		subWizard="/usr/share/wizards/server_wizard/server.wiz"
+		subWizard="__WIZ_HOME__/server_wizard/server.wiz"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="false"
diff --git a/proxy_wizard/scripts/Squidconf.pm b/proxy_wizard/scripts/Squidconf.pm
index e7788fec..fa99558d 100644
--- a/proxy_wizard/scripts/Squidconf.pm
+++ b/proxy_wizard/scripts/Squidconf.pm
@@ -1,15 +1,15 @@
 #!/usr/bin/perl
 
 package Squidconf;
-require "/usr/share/wizards/common/scripts/Vareqval.pm";
-require "/usr/share/wizards/common/scripts/Varspaceval.pm";
+require "__WIZ_HOME__/common/scripts/Vareqval.pm";
+require "__WIZ_HOME__/common/scripts/Varspaceval.pm";
 use MDK::Common;
 use strict;
 
 sub	do_it_squid {
     my $file="/etc/squid/squid.conf";
     -f $file and MDK::Common::cp_af($file, $file.".orig");
-    MDK::Common::cp_af("/usr/share/wizards/proxy_wizard/scripts/squid.conf.default", $file);
+    MDK::Common::cp_af("__WIZ_HOME__/proxy_wizard/scripts/squid.conf.default", $file);
     print "$ENV{wiz_squid_defdir}\n";
     substInFile {
 	s|^\s*\#?\s*(cache_dir.*$ENV{wiz_squid_defdir}\s*)\d*(.*)|$1$ENV{wiz_squid_disk}$2|;
diff --git a/samba_wizard/samba.wiz b/samba_wizard/samba.wiz
index 8eef7438..f490b5dc 100644
--- a/samba_wizard/samba.wiz
+++ b/samba_wizard/samba.wiz
@@ -3,11 +3,11 @@
 
 <Wizard
 	name="general"
-	libScript="/usr/share/wizards/common/scripts/functions.sh"
+	libScript="__WIZ_HOME__/common/scripts/functions.sh"
 	wizardTitle="Samba wizard"
 	imagePosition="top"
-	defaultImage="/usr/share/wizards/samba_wizard/images/samba"
-	perlModule="/usr/share/wizards/samba_wizard/scripts/Smbconf.pm"
+	defaultImage="__WIZ_HOME__/samba_wizard/images/samba"
+	perlModule="__WIZ_HOME__/samba_wizard/scripts/Smbconf.pm"
 	rpm="samba-server"
 >
 
@@ -42,7 +42,7 @@
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-samba.html"
 		name="Welcome"
-		jumpScript="/usr/share/wizards/common/scripts/check.sh root wiz_ip_net"
+		jumpScript="__WIZ_HOME__/common/scripts/check.sh root wiz_ip_net"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -87,7 +87,7 @@
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-samba.html"
 		name="ask_services"
-		jumpScript="/usr/share/wizards/samba_wizard/scripts/check_services.sh"
+		jumpScript="__WIZ_HOME__/samba_wizard/scripts/check_services.sh"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -163,7 +163,7 @@
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-samba.html"
 		name="ask_workgroup"
-		jumpScript="/usr/share/wizards/samba_wizard/scripts/check_workgroup.sh"
+		jumpScript="__WIZ_HOME__/samba_wizard/scripts/check_workgroup.sh"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -223,7 +223,7 @@
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-samba.html"
 		name="ask_banner"
-		jumpScript="/usr/share/wizards/samba_wizard/scripts/check_banner.sh"
+		jumpScript="__WIZ_HOME__/samba_wizard/scripts/check_banner.sh"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -413,7 +413,7 @@ needed to configure Samba."
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-samba.html"
 		name="error_need_net"
-		subWizard="/usr/share/wizards/server_wizard/server.wiz"
+		subWizard="__WIZ_HOME__/server_wizard/server.wiz"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="false"
diff --git a/samba_wizard/scripts/Smbconf.pm b/samba_wizard/scripts/Smbconf.pm
index 5385d429..577c1870 100755
--- a/samba_wizard/scripts/Smbconf.pm
+++ b/samba_wizard/scripts/Smbconf.pm
@@ -1,8 +1,8 @@
 #! /usr/bin/perl -w
 
 package Smbconf;
-require "/usr/share/wizards/common/scripts/Vareqval.pm";
-require "/usr/share/wizards/common/scripts/DrakconnectConf.pm";
+require "__WIZ_HOME__/common/scripts/Vareqval.pm";
+require "__WIZ_HOME__/common/scripts/DrakconnectConf.pm";
 
 use strict;
 
@@ -98,7 +98,7 @@ sub	printer_sharing {
 
 sub	do_it {
 
-    read_conf("/usr/share/wizards/samba_wizard/scripts/smb.conf.default");
+    read_conf("__WIZ_HOME__/samba_wizard/scripts/smb.conf.default");
     chg_var("global", "workgroup", $ENV{wiz_workgroup});
     chg_var("global", "server string", $ENV{wiz_banner});
     my $ip = $o->get_from_known_dev("IP");
diff --git a/server_wizard/scripts/Serverconf.pm b/server_wizard/scripts/Serverconf.pm
index 2af5647d..4f70e74a 100644
--- a/server_wizard/scripts/Serverconf.pm
+++ b/server_wizard/scripts/Serverconf.pm
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 package Serverconf;
-require "/usr/share/wizards/common/scripts/Vareqval.pm";
+require "__WIZ_HOME__/common/scripts/Vareqval.pm";
 use MDK::Common;
 use strict;
 
diff --git a/server_wizard/server.wiz b/server_wizard/server.wiz
index 47e7319c..14fab983 100644
--- a/server_wizard/server.wiz
+++ b/server_wizard/server.wiz
@@ -3,11 +3,11 @@
 
 <Wizard
 	name="general"
-	libScript="/usr/share/wizards/common/scripts/functions.sh"
+	libScript="__WIZ_HOME__/common/scripts/functions.sh"
 	wizardTitle="Server Wizard"
 	imagePosition="top"
-	defaultImage="/usr/share/wizards/server_wizard/images/intranet"
-	perlModule="/usr/share/wizards/server_wizard/scripts/Serverconf.pm"
+	defaultImage="__WIZ_HOME__/server_wizard/images/intranet"
+	perlModule="__WIZ_HOME__/server_wizard/scripts/Serverconf.pm"
 >
 
 	<Variable
@@ -72,7 +72,7 @@
 	<Page
 		name="Welcome"
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-basics.html"
-		jumpScript="/usr/share/wizards/common/scripts/check.sh root"
+		jumpScript="__WIZ_HOME__/common/scripts/check.sh root"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -135,7 +135,7 @@
 	<Page
 		name="Note"
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-basics.html"
-		jumpScript="/usr/share/wizards/server_wizard/scripts/check_config.sh"
+		jumpScript="__WIZ_HOME__/server_wizard/scripts/check_config.sh"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -186,7 +186,7 @@
 	<Page
 		name="ask_hostname"
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-basics.html"
-		jumpScript="/usr/share/wizards/server_wizard/scripts/check_domain.sh"
+		jumpScript="__WIZ_HOME__/server_wizard/scripts/check_domain.sh"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -254,7 +254,7 @@
 	<Page
 		name="choose_net_device"
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-basics.html"
-		jumpScript="/usr/share/wizards/server_wizard/scripts/set_ip.sh"
+		jumpScript="__WIZ_HOME__/server_wizard/scripts/set_ip.sh"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -276,7 +276,7 @@
 		<Chooser
 			name="deviceChooser"
 			variableName="net_device"
-			fillScript="/usr/share/wizards/server_wizard/scripts/liste_device.sh"
+			fillScript="__WIZ_HOME__/server_wizard/scripts/liste_device.sh"
 			helpText="Device:"
 			helpFontName="Default"
 			helpFontStyle="plain"
@@ -317,7 +317,7 @@
 		<Freetext
 			name="domainnameField"
 			variableName="domainname"
-			fillScript="/usr/share/wizards/server_wizard/scripts/compute_domain.sh"
+			fillScript="__WIZ_HOME__/server_wizard/scripts/compute_domain.sh"
 			helpText="Computed domain Name"
 			editable="false"
 		>
@@ -345,7 +345,7 @@
 	<Page
 		name="ask_network_address"
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-basics.html"
-		jumpScript="/usr/share/wizards/server_wizard/scripts/check_network.sh"
+		jumpScript="__WIZ_HOME__/server_wizard/scripts/check_network.sh"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -379,7 +379,7 @@
 		<Freetext
 			name="freetext2"
 			variableName="network_address"
-			fillScript="/usr/share/wizards/server_wizard/scripts/compute_ipnet.sh"
+			fillScript="__WIZ_HOME__/server_wizard/scripts/compute_ipnet.sh"
 			helpText="IP net address:"
 			editable="true"
 		>
@@ -426,7 +426,7 @@
 		<Freetext
 			name="freetext3"
 			variableName="server_address"
-			fillScript="/usr/share/wizards/server_wizard/scripts/compute_server_ip.sh"
+			fillScript="__WIZ_HOME__/server_wizard/scripts/compute_server_ip.sh"
 			editable="false"
 		>
 		</Freetext>
@@ -471,7 +471,7 @@
 	<Page
 		name="ask_server_address"
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-basics.html"
-		jumpScript="/usr/share/wizards/server_wizard/scripts/check_server_ip.sh"
+		jumpScript="__WIZ_HOME__/server_wizard/scripts/check_server_ip.sh"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
diff --git a/time_wizard/time.wiz b/time_wizard/time.wiz
index 508fedfa..9a4c7dcf 100644
--- a/time_wizard/time.wiz
+++ b/time_wizard/time.wiz
@@ -3,10 +3,10 @@
 
 <Wizard
 	name="general"
-	libScript="/usr/share/wizards/common/scripts/functions.sh"
+	libScript="__WIZ_HOME__/common/scripts/functions.sh"
 	wizardTitle="Time wizard"
 	imagePosition="top"
-	defaultImage="/usr/share/wizards/time_wizard/images/Time"
+	defaultImage="__WIZ_HOME__/time_wizard/images/Time"
 >
 
 	<Variable
@@ -61,7 +61,7 @@
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-time.html"
 		name="welcome"
-		jumpScript="/usr/share/wizards/common/scripts/check.sh root wiz_ip_net"
+		jumpScript="__WIZ_HOME__/common/scripts/check.sh root wiz_ip_net"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -116,7 +116,7 @@
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-time.html"
 		name="choice_setting"
-		jumpScript="/usr/share/wizards/time_wizard/scripts/handle_local_internet.sh"
+		jumpScript="__WIZ_HOME__/time_wizard/scripts/handle_local_internet.sh"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -220,7 +220,7 @@
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-time.html"
 		name="no_network"
-		jumpScript="/usr/share/wizards/time_wizard/scripts/install_rpm.sh"
+		jumpScript="__WIZ_HOME__/time_wizard/scripts/install_rpm.sh"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -268,7 +268,7 @@
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-time.html"
 		name="no_tools"
-		jumpScript="/usr/share/wizards/time_wizard/scripts/install_rpm.sh"
+		jumpScript="__WIZ_HOME__/time_wizard/scripts/install_rpm.sh"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -311,7 +311,7 @@
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-time.html"
 		name="not_installed"
-		jumpScript="/usr/share/wizards/time_wizard/scripts/test_tools.sh"
+		jumpScript="__WIZ_HOME__/time_wizard/scripts/test_tools.sh"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -740,7 +740,7 @@
 			name="wiz_timezone"
 			variableName="wiz_timezone"
 			defaultOptionScript="get_var wiz_timezone"
-			fillScript="/usr/share/wizards/time_wizard/scripts/compute_liste.sh"
+			fillScript="__WIZ_HOME__/time_wizard/scripts/compute_liste.sh"
 			helpText="Choose a time zone:"
 			helpFontName="Default"
 			helpFontStyle="plain"
@@ -753,7 +753,7 @@
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-time.html"
 		name="test_server"
-		jumpScript="/usr/share/wizards/time_wizard/scripts/test_timeservers.sh"
+		jumpScript="__WIZ_HOME__/time_wizard/scripts/test_timeservers.sh"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -834,7 +834,7 @@
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-time.html"
 		name="server_not_responding"
-		jumpScript="/usr/share/wizards/time_wizard/scripts/handle_no_network.sh"
+		jumpScript="__WIZ_HOME__/time_wizard/scripts/handle_no_network.sh"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -954,7 +954,7 @@
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-time.html"
 		name="error_need_net"
-		subWizard="/usr/share/wizards/server_wizard/server.wiz"
+		subWizard="__WIZ_HOME__/server_wizard/server.wiz"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="false"
diff --git a/web_wizard/scripts/Webconf.pm b/web_wizard/scripts/Webconf.pm
index be697513..06a17fa5 100644
--- a/web_wizard/scripts/Webconf.pm
+++ b/web_wizard/scripts/Webconf.pm
@@ -1,8 +1,8 @@
 #!/usr/bin/perl
 
 package Webconf;
-require "/usr/share/wizards/common/scripts/Vareqval.pm";
-require "/usr/share/wizards/common/scripts/DrakconnectConf.pm";
+require "__WIZ_HOME__/common/scripts/Vareqval.pm";
+require "__WIZ_HOME__/common/scripts/DrakconnectConf.pm";
 use MDK::Common;
 
 use strict;
diff --git a/web_wizard/web.wiz b/web_wizard/web.wiz
index 93391c0e..4adcf3e0 100644
--- a/web_wizard/web.wiz
+++ b/web_wizard/web.wiz
@@ -3,11 +3,11 @@
 
 <Wizard
 	name="general"
-	libScript="/usr/share/wizards/common/scripts/functions.sh"
+	libScript="__WIZ_HOME__/common/scripts/functions.sh"
 	wizardTitle="Web wizard"
 	imagePosition="top"
-	defaultImage="/usr/share/wizards/web_wizard/images/apache"
-	perlModule="/usr/share/wizards/web_wizard/scripts/Webconf.pm"
+	defaultImage="__WIZ_HOME__/web_wizard/images/apache"
+	perlModule="__WIZ_HOME__/web_wizard/scripts/Webconf.pm"
 	rpm="apache-conf"
 >