From f17c6b337add82da0a2886b9a12ac1e31d09806b Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sat, 13 Apr 2013 11:15:31 +0200
Subject: [PATCH] gcc: fix installation.

---
 srcpkgs/gcc/template | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 60439d90b7..104deb5ae0 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -12,7 +12,7 @@ license="GFDL-1.2, GPL-3, LGPL-2.1"
 distfiles="http://ftp.gnu.org/pub/gnu/gcc/gcc-$version/gcc-$version.tar.bz2"
 checksum=8a9283d7010fb9fe5ece3ca507e0af5c19412626384f8a5e9434251ae100b084
 
-if [ "${XBPS_TARGET_MACHINE}" = "x86_64" ]; then
+if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	# Required stuff for multilib packages.
 	_triplet="${XBPS_MACHINE}-unknown-linux-gnu"
 	makedepends+=" glibc32-devel"
@@ -132,7 +132,7 @@ gcc-c++-multilib_package() {
 	}
 }
 
-gcc-c-multilib_package() {
+gcc-multilib_package() {
 	depends="gcc>=${_majorver} libgcc32>=${_majorver} libgomp32>=${_majorver} libitm32>=${_majorver} zlib32 glibc32-devel"
 	short_desc="GCC C compiler (multilib files)"
 	noverifyrdeps=yes
@@ -140,7 +140,7 @@ gcc-c-multilib_package() {
 	pkg_install() {
 		vmove usr/lib/gcc/${_triplet}/${_majorver}/32
 		vmove "usr/lib32/libssp*.a"
-		vinstall host-${_triplet}/gcc/specs 644 usr/lib/gcc/${_triplet}/${_majorver}/32
+		vinstall ${wrksrc}/host-${_triplet}/gcc/specs 644 usr/lib/gcc/${_triplet}/${_majorver}/32
 	}
 }
 
@@ -167,8 +167,7 @@ libgomp32_package() {
 	depends="libgcc32 glibc32"
 	short_desc="GCC OpenMP v3.0 shared support library (32bit)"
 	noverifyrdeps=yes
-
-	do_install() {
+	pkg_install() {
 		vmove "usr/lib32/libgomp.*"
 	}
 }
@@ -310,9 +309,9 @@ libgfortran_package() {
 	short_desc="GCC Fortran library ${version} shared library support"
 
 	pkg_install() {
-		vmove "usr/lib/libgfortran.so*" usr/lib
-		vmove usr/lib/libgfortran.spec usr/lib
-		vinstall COPYING.RUNTIME 644 usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION
+		vmove "usr/lib/libgfortran.so*"
+		vmove usr/lib/libgfortran.spec
+		vinstall ${wrksrc}/COPYING.RUNTIME 644 usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION
 	}
 }
 
@@ -331,7 +330,7 @@ libgo_package() {
 
 	pkg_install() {
 		vmove "usr/lib/libgo.so*"
-		vinstall COPYING.RUNTIME 644 usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION
+		vinstall ${wrksrc}/COPYING.RUNTIME 644 usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION
 	}
 }
 
@@ -349,7 +348,7 @@ libobjc_package() {
 
 	pkg_install() {
 		vmove "usr/lib/libobjc.so*"
-		vinstall COPYING.RUNTIME 644 usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION
+		vinstall ${wrksrc}/COPYING.RUNTIME 644 usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION
 	}
 }
 
@@ -369,7 +368,7 @@ libquadmath_package() {
 
 	pkg_install() {
 		vmove "usr/lib/libquadmath.so*"
-		vinstall COPYING.RUNTIME 644 usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION
+		vinstall ${wrksrc}/COPYING.RUNTIME 644 usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION
 	}
 }
 
@@ -381,7 +380,7 @@ libgcc_package() {
 
 	pkg_install() {
 		vmove "usr/lib/libgcc_s.so*"
-		vinstall COPYING.RUNTIME 644 usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION
+		vinstall ${wrksrc}/COPYING.RUNTIME 644 usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION
 	}
 }
 
@@ -403,7 +402,7 @@ libgomp_package() {
 		vmove usr/lib/gcc/${_triplet}/${_majorver}/include/omp.h
 		vmove "usr/lib/libgomp*.so*"
 		vmove usr/lib/libgomp.spec
-		vinstall COPYING.RUNTIME 644 usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION
+		vinstall ${wrksrc}/COPYING.RUNTIME 644 usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION
 	}
 }
 
@@ -430,7 +429,7 @@ libmudflap_package() {
 
 	pkg_install() {
 		vmove "usr/lib/libmudflap*.so*"
-		vinstall COPYING.RUNTIME 644 usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION
+		vinstall ${wrksrc}/COPYING.RUNTIME 644 usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION
 	}
 }
 
@@ -449,7 +448,7 @@ libssp_package() {
 
 	pkg_install() {
 		vmove "usr/lib/libssp.so*"
-		vinstall COPYING.RUNTIME 644 usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION
+		vinstall ${wrksrc}/COPYING.RUNTIME 644 usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION
 	}
 }
 
@@ -460,7 +459,8 @@ libstdc++-devel_package() {
 	pkg_install() {
 		vmove "usr/lib/libstdc++.*a"
 		vmove "usr/lib/libsupc++.*"
-		vmove usr/include/c++
+		vmove usr/include/c++/${_majorver}/${_triplet}/bits
+		vmove "usr/include/c++/${_majorver}/*.h"
 	}
 }
 
@@ -471,7 +471,7 @@ libstdc++_package() {
 		vmove "usr/lib/libstdc++.so*"
 		vmove usr/share/locale/fr/LC_MESSAGES/libstdc++.mo
 		vmove usr/share/locale/de/LC_MESSAGES/libstdc++.mo
-		vinstall COPYING.RUNTIME 644 usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION
+		vinstall ${wrksrc}/COPYING.RUNTIME 644 usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION
 	}
 }