# HG changeset patch
# User Antoine Bodin <gokhlayeh@slitaz.org>
# Date 1297473538 -3600
# Node ID eefa66c18286d26eb48f11b0f2128d99c6c6a72c
# Parent  5a2ca8500e9a92625d64a2bad524621349151980
gcc+gcj: remove build dir after packing files, don't exit but return

diff -r 5a2ca8500e9a -r eefa66c18286 elfutils/receipt
--- a/elfutils/receipt	Sat Feb 12 02:15:32 2011 +0100
+++ b/elfutils/receipt	Sat Feb 12 02:18:58 2011 +0100
@@ -5,7 +5,7 @@
 CATEGORY="development"
 SHORT_DESC="ELF object file access library."
 MAINTAINER="pascal.bellard@slitaz.org"
-DEPENDS="glibc-base"
+DEPENDS="glibc-base elfutils"
 BUILD_DEPENDS="binutils"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WEB_SITE="https://fedorahosted.org/elfutils/"
diff -r 5a2ca8500e9a -r eefa66c18286 gcc+gcj/receipt
--- a/gcc+gcj/receipt	Sat Feb 12 02:15:32 2011 +0100
+++ b/gcc+gcj/receipt	Sat Feb 12 02:18:58 2011 +0100
@@ -41,7 +41,7 @@
 		# Exit if download failed to avoid errors.
 		if [ ! -f "$SOURCES_REPOSITORY/$ECJ_JAR" ] ; then
 			echo -e "\nECJ jar download failed, exiting. Please check ECJ_URL variable.\n"
-			exit 1
+			return 1
 		fi
 	else
 		echo -n "ECJ jar exit... "
@@ -58,12 +58,12 @@
 
 	# Use libiberty.a from binutils.
 	sed -i 's/install_to_$(INSTALL_DEST) //' \
-		$SOURCE-$VERSION/libiberty/Makefile.in || exit 1
+		$src/libiberty/Makefile.in || return 1
     mkdir -p $SOURCE-$VERSION-build
     cd $SOURCE-$VERSION-build
 	
     PYTHON_LIB=python$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
-    ../$SOURCE-$VERSION/configure --prefix=/usr --libexecdir=/usr/lib \
+    ../${src##*/}/configure --prefix=/usr --libexecdir=/usr/lib \
 		--infodir=/usr/share/info --mandir=/usr/share/man --enable-nls \
 		--enable-languages=c,c++,objc,java --enable-shared \
 		--with-system-zlib \
@@ -77,10 +77,10 @@
 		--enable-gtk-cairo \
 		--enable-lto \
 		$CONFIGURE_ARGS  $GCC_TARGET  &&
-    make -j 4 bootstrap &&
+    make bootstrap &&
     # Make install in the source tree to help creating derived pkgs
     # and keep $_pkg variable set for genpkg.
-    make -j 4 DESTDIR=$src/_pkg install
+    make install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
@@ -97,6 +97,7 @@
     rm $fs/usr/lib/libgomp.so*
     # Include files.
     cp -a $_pkg/usr/include $fs/usr
+    rm -r $WOK/$PACKAGE/$SOURCE-$VERSION-build
 }
 
 # Post install commands for Tazpkg.
@@ -113,10 +114,4 @@
 	fi
 }
 
-# Rules to clean the package
-clean_wok()
-{
-	rm -r $SOURCE-$VERSION-build
-}
-
 TAZBB_NO_INSTALL="because it does not support objc and gfortran (yet)"