Fix search and replace for __WIZ_HOME__ and fix wrongly committed files

2 files changed, 11 insertions, 11 deletions

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;