Fix: makepack

diff --git a/make/makepack-awstats.pl b/make/makepack-awstats.pl
index cdff1e93f6dcd458805ab824ebe7d6047e05ef59..70407c5b941a337ac3a7c0b53d062b61830f827a 100644 (file)
--- a/make/makepack-awstats.pl
+++ b/make/makepack-awstats.pl
@@ -122,7 +122,7 @@ while (! $found) {
                printf(" %d - %3s    (%s)\n",$cpt,$target,"Need ".$REQUIREMENTTARGET{$target});
        }
 
-       # On demande de choisir le fichier à passer
+       # On demande de choisir le fichier � passer
        print "Choose one package number or several separated with space: ";
        $NUM_SCRIPT=<STDIN>; 
        chomp($NUM_SCRIPT);
@@ -277,12 +277,13 @@ rename("$BUILDROOT/$PROJECT","$BUILDROOT/$FILENAMETGZ");
        }       
     
        if ($target eq 'ZIP') {
-                       unlink $FILENAMEZIP.zip;
-                       print "Compress $FILENAMETGZ into $FILENAMEZIP.zip...\n";
+                       unlink $FILENAMEZIP.zip;
+                       print "Compress $FILENAMETGZ into $FILENAMEZIP.zip...\n";
                chdir("$BUILDROOT");
-               #print "cd $BUILDROOTNT & 7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*.*\n";
-               #$ret=`cd $BUILDROOTNT & 7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*.*`;
-               $ret=`7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*.*`;
+               #print "cd $BUILDROOT & 7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*.*\n";
+               #$ret=`cd $BUILDROOT & 7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*.*`;
+               print "7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ/*\n";
+               $ret=`7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ/*`;
                print "Move $FILENAMEZIP.zip to $DESTI\n";
                rename("$BUILDROOT/$FILENAMEZIP.zip","$DESTI/$FILENAMEZIP.zip");
                next;