# HG changeset patch
# User Eric Joseph-Alexandre <erjo@slitaz.org>
# Date 1331429555 -3600
# Node ID 012178e959df78d074e5bb587c5c08766f11c4df
# Parent  8fd412038da2810f933099bec296fecba6f39aba
Up: sarg (2.3.1) + improve receipt

diff -r 8fd412038da2 -r 012178e959df sarg/receipt
--- a/sarg/receipt	Sat Mar 10 23:13:38 2012 +0100
+++ b/sarg/receipt	Sun Mar 11 02:32:35 2012 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="sarg"
-VERSION="2.2.6"
+VERSION="2.3.1"
 CATEGORY="network"
 SHORT_DESC="Squid Analysis Report Generator."
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -12,28 +12,22 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
-	./configure --prefix=/usr --infodir=/usr/share/info \
-	--enable-sysconfdir=/etc/sarg --enable-htmldir=/var/www \
-	--mandir=/usr/share/man $CONFIGURE_ARGS &&
-	make || return 1
-	sed -e "s|/usr/bin|$PWD/_pkg/usr/bin|" \
-	    -e "s|/etc/sarg|$PWD/_pkg/etc/sarg|" \
-	    -e "s|/var/www|$PWD/_pkg/var/www|" \
-	    -e "s|/usr/local/man/man1|$PWD/_pkg/usr/man/man1|" \
-	    < Makefile > Makefile.install
-	mkdir -p $PWD/_pkg/usr/bin $PWD/_pkg/etc/sarg $PWD/_pkg/var/www \
-		 $PWD/_pkg/usr/man/man1
-	make -f Makefile.install install
+	./configure --sysconfdir=/etc/sarg \
+		--bindir=/usr/bin \
+		--enable-htmldir=/var/www \
+		--enable-fontdir=/usr/share/sarg/fonts \
+		--enable-imagedir=/usr/share/sarg/images \
+		--enable-sargphp=/var/www/sarg-php \
+		&&	make && make install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr
-	cp -a $_pkg/var $fs
-	cp -a $_pkg/etc $fs
-	rm -rf $fs/etc/sarg/sarg-php
-	cp -a $_pkg/usr/bin $fs/usr
+	mkdir -p $fs/usr $fs/usr/share
+	cp -a $install/var $fs
+	cp -a $install/etc $fs
+	cp -a $install/usr/bin $fs/usr
+	cp -a $install/usr/share/sarg $fs/usr/share
 }