From 79173dd271c10ac6cd90e8fde8920cf5d9591671 Mon Sep 17 00:00:00 2001
From: eldy <>
Date: Wed, 23 Jun 2010 11:40:09 +0000
Subject: [PATCH] Fix: Build of rpm from ubuntu

---
 make/makepack-awstats.pl | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/make/makepack-awstats.pl b/make/makepack-awstats.pl
index 3b6a5a25..539b4fb6 100644
--- a/make/makepack-awstats.pl
+++ b/make/makepack-awstats.pl
@@ -32,6 +32,8 @@ $FILENAMEZIP="$PROJECT-$MAJOR.$MINOR";
 $FILENAMERPM="$PROJECT-$MAJOR.$MINOR-$RPMSUBVERSION";
 $FILENAMEDEB="$PROJECT-$MAJOR.$MINOR";
 $FILENAMEEXE="$PROJECT-$MAJOR.$MINOR";
+# ubuntu
+$RPMDIR="./../../../rpmbuild";
 if (-d "/usr/src/redhat") {
     # redhat
     $RPMDIR="/usr/src/redhat";
@@ -40,10 +42,6 @@ if (-d "/usr/src/RPM") {
     # mandrake
     $RPMDIR="/usr/src/RPM";
 }
-if (-d "/usr/src/rpm") {
-    # ubuntu
-    $RPMDIR="/usr/src/rpm";
-}
 use vars qw/ $REVISION $VERSION /;
 $REVISION='$Revision$'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
 $VERSION="1.0 (build $REVISION)";
@@ -296,10 +294,12 @@ rename("$BUILDROOT/$PROJECT","$BUILDROOT/$FILENAMETGZ");
     	if ($target eq 'RPM') {                 # Linux only
     		$BUILDFIC="$FILENAME.spec";
     		unlink $FILENAMETGZ.tgz;
-    		print "Compress $FILENAMETGZ into $FILENAMETGZ.tgz...\n";
-    		$ret=`tar --exclude-from "$SOURCE/make/tgz/tar.exclude" --directory "$BUILDROOT" -czvf "$BUILDROOT/$FILENAMETGZ.tgz" $FILENAMETGZ`;
-
-    		print "Move $FILENAMETGZ.tgz to $RPMDIR/SOURCES/$FILENAMETGZ.tgz\n";
+    		print "Compress $FILENAMETGZ into $FILENAMETGZ.tgz for RPM build...\n";
+    		$cmd="tar --exclude-from \"$SOURCE/make/tgz/tar.exclude\" --directory \"$BUILDROOT\" -czvf \"$BUILDROOT/$FILENAMETGZ.tgz\" $FILENAMETGZ";
+    		print $cmd."\n";
+			$ret=`$cmd`;
+		
+    		print "Move $BUILDROOT/$FILENAMETGZ.tgz to $RPMDIR/SOURCES/$FILENAMETGZ.tgz\n";
     		$cmd="mv \"$BUILDROOT/$FILENAMETGZ.tgz\" \"$RPMDIR/SOURCES/$FILENAMETGZ.tgz\"";
             $ret=`$cmd`;
 
-- 
2.47.3