--- file_not_specified_in_diff	
+++ file_not_specified_in_diff	
@@ -26,0 +26,2 @@ 
+	# Respect CFLAGS
+	epatch "${FILESDIR}"/${PN}-1.24-Makefile.patch
@@ -27,1 +29,1 @@ 
-	sed -i -e "s:-shared:-shared -Wl,-soname,\$@ :g" buildgcc/Makefile
---
+	sed -i -e "s:-shared:-shared -Wl,-soname,\$@ :g" build/gcc/Makefile
@@ -29,5 +31,5 @@ 
-	sed -i -e \
-	    "s:/usr/lib/jvm/java-6-sun-1.6.0.00:$(java-config --jdk-home):g" \
-	    buildgcc/Makefile || die "sed failed"
-	# respect CFLAGS, remove strip and other hard-coded crap
-	epatch "${FILESDIR}"/${PN}-1.22-Makefile.patch
---
+	if use java ; then
+		sed -i -e \
+			"s:/usr/lib/jvm/java-6-sun-1.6.0.00:$(java-config --jdk-home):g" \
+			build/gcc/Makefile || die "sed failed"
+	fi
@@ -37,1 +39,1 @@ 
-	cd buildgcc
---
+	cd build/gcc
@@ -39,2 +41,10 @@ 
-	emake CXX="$(tc-getCXX)" all $(use java && echo javaall) \
-	    || die "build failed"
---
+	if use debug ; then
+		# Build debug target
+		emake CXX="$(tc-getCXX)" debug staticdebug \
+			$(use java && echo javadebug) $(use libs && echo shareddebug) \
+			|| die "make debug failed"
+	else
+		# Build release target
+		emake CXX="$(tc-getCXX)" release static $(use java && echo java) \
+			$(use libs && echo shared) || die "make release failed"
+	fi
@@ -44,0 +54,2 @@ 
+	cd build/gcc
+
@@ -45,11 +57,12 @@ 
-	    newbin bin/astyled astyle || die "install debug bin failed"
-	    newlib.a bin/libastyled.a libastyle.a  \
-		|| die "install debug static lib failed"
-	    if use libs ; then
-		newlib.so bin/libastyled.so libastyle.so \
-		    || die "install debug shared lib failed"
-		if use java ; then
-		    local j_dir="/usr/$(get_libdir)"
-		    dolib.so bin/libastylejd.so \
-			|| die "install debug shared java lib failed"
-		    java-pkg_regso "${D}${j_dir}/libastylejd.so"
---
+		newbin bin/astyled astyle || die "install debug bin failed"
+		newlib.a bin/libastyled.a libastyle.a  \
+			|| die "install debug static lib failed"
+		if use libs ; then
+			newlib.so bin/libastyled.so libastyle.so \
+				|| die "install debug shared lib failed"
+			if use java ; then
+				local j_dir="/usr/$(get_libdir)"
+				dolib.so bin/libastylejd.so \
+					|| die "install debug shared java lib failed"
+				java-pkg_regso "${D}${j_dir}/libastylejd.so"
+			fi
@@ -57,1 +70,0 @@ 
-	    fi
@@ -59,7 +71,8 @@ 
-	    if use libs ; then
-		dolib.so bin/libastyle.so || die "install shared lib failed"
-		if use java ; then
-		    local j_dir="/usr/$(get_libdir)"
-		    dolib.so bin/libastylej.so \
-			|| die "install shared java lib failed"
-		    java-pkg_regso "${D}${j_dir}/libastylej.so"
---
+		if use libs ; then
+			dolib.so bin/libastyle.so || die "install shared lib failed"
+			if use java ; then
+				local j_dir="/usr/$(get_libdir)"
+				dolib.so bin/libastylej.so \
+					|| die "install shared java lib failed"
+				java-pkg_regso "${D}${j_dir}/libastylej.so"
+			fi
@@ -67,3 +80,2 @@ 
-	    fi
-	    dobin bin/astyle || die "install bin failed"
-	    dolib.a bin/libastyle.a || die "install static lib failed"
---
+		dobin bin/astyle || die "install bin failed"
+		dolib.a bin/libastyle.a || die "install static lib failed"
@@ -71,1 +83,1 @@ 
-	dohtml doc/*.html
---
+	dohtml "${S}"/doc/*