From: eldy <>
Date: Sat, 8 Jan 2011 15:44:54 +0000 (+0000)
Subject: EXE Packaging works on Linux with Wine
X-Git-Tag: AWSTATS_7_0_BETA~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d50887c6c2b25a57a8e7cbf0f5bd4b465086ee27;p=thirdparty%2FAWStats.git

EXE Packaging works on Linux with Wine
---

diff --git a/make/exe/awstats.nsi b/make/exe/awstats.nsi
index 32dcb2cc..7b0e562d 100644
--- a/make/exe/awstats.nsi
+++ b/make/exe/awstats.nsi
@@ -103,7 +103,7 @@
   LangString SETUP_SUBTITLE ${LANG_ENGLISH} "Building AWStats config files"
 
   LangString PERLCHECK_TITLE ${LANG_FRENCH} "Verification Perl"
-  LangString PERLCHECK_SUBTITLE ${LANG_FRENCH} "Verifie sur une interpreteur Perl operationnel peut etre trouve"
+  LangString PERLCHECK_SUBTITLE ${LANG_FRENCH} "Verifie si un interpreteur Perl operationnel peut etre trouve"
   LangString SETUP_TITLE ${LANG_FRENCH} "Configuration"
   LangString SETUP_SUBTITLE ${LANG_FRENCH} "Construction des fichiers de configuration AWStats"
 
diff --git a/make/makepack-awstats.pl b/make/makepack-awstats.pl
index e74e4db7..cdf851ca 100644
--- a/make/makepack-awstats.pl
+++ b/make/makepack-awstats.pl
@@ -332,13 +332,14 @@ rename("$BUILDROOT/$PROJECT","$BUILDROOT/$FILENAMETGZ");
     }
     
 	if ($target eq 'EXE') {
-    		unlink "$FILENAMEEXE.exe";
-    		print "Compress into $FILENAMEEXE.exe by $FILENAME.nsi...\n";
-    		$command="\"$REQUIREMENTTARGET{$target}\" /DMUI_VERSION_DOT=$MAJOR.$MINOR /X\"SetCompressor bzip2\" \"$SOURCE\\make\\exe\\$FILENAME.nsi\"";
+    	unlink "$FILENAMEEXE.exe";
+    	print "Compress into $FILENAMEEXE.exe by $FILENAME.nsi...\n";
+    	$command="\"$REQUIREMENTTARGET{$target}\" /DMUI_VERSION_DOT=$MAJOR.$MINOR /X\"SetCompressor bzip2\" \"$SOURCE\\make\\exe\\$FILENAME.nsi\"";
         print "$command\n";
 		$ret=`$command`;
-		print "Move $FILENAMEEXE.exe to $DESTI\n";
-		rename("$SOURCE\\make\\exe\\$FILENAMEEXE.exe","$DESTI/$FILENAMEEXE.exe");
+		print "Move $SOURCE\\make\\exe\\$FILENAMEEXE.exe to $DESTI\n";
+		rename("$SOURCE/make/exe/$FILENAMEEXE.exe","$DESTI/$FILENAMEEXE.exe");
+#		rename("$SOURCE\\make\\exe\\$FILENAMEEXE.exe","$DESTI\\$FILENAMEEXE.exe");
 		next;
 	}