EXE Packaging works on Linux with Wine

diff --git a/make/exe/awstats.nsi b/make/exe/awstats.nsi
index 32dcb2cc54df366f46ef2b01b358c667574ae108..7b0e562d72f4ac607bb5c34fa7b2c5427003fd91 100644 (file)
--- 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 e74e4db76b3832f5976bb6d372e6a3b45018d37f..cdf851ca503dac8d9b3ed8c9726d89563bee4f1f 100644 (file)
--- 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;
        }