From 5c3390ac1509c1ab651a3ec71e11e383b9a94fc2 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Thu, 11 Nov 2010 22:47:18 +0000
Subject: [PATCH] * Add an include/g++ symlink in the package. Apparently it isn't created by   "make install" anymore. * Add the "current" symlink in the ".../tools" directory.


git-svn-id: file:///srv/svn/repos/haiku/buildtools/trunk@39406 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 build-gcc4-optional-package-Haiku.sh | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/build-gcc4-optional-package-Haiku.sh b/build-gcc4-optional-package-Haiku.sh
index 19d443a..d6d91e2 100755
--- a/build-gcc4-optional-package-Haiku.sh
+++ b/build-gcc4-optional-package-Haiku.sh
@@ -54,7 +54,9 @@
 	exit 1
 fi
 
+gccVersionedName=gcc-${gccVersion}-haiku-${gccDate}
 
+
 # get the architecture
 gccArch=`uname -m`
 case $gccArch in
@@ -64,7 +66,7 @@
 
 
 # check whether the installation dir does already exit
-installDir=/boot/develop/abi/$gccArch/gcc4/tools/gcc-${gccVersion}-haiku-${gccDate}
+installDir=/boot/develop/abi/$gccArch/gcc4/tools/$gccVersionedName
 if [ -e "$installDir" ]; then
 	echo "The installation directory '$installDir' does already exist." >&2
 	echo "Remove it first." >&2
@@ -115,8 +117,12 @@
 # remove installed stuff we don't want
 rm -rf "$installDir/info" "$installDir/man" "$installDir/share" \
 	"$installDir/lib/libstdc++.so"
+
 
+# add C++ header symlink
+ln -s c++/$gccVersion $installDir/include/g++
 
+
 # zip everything up
 gccVersionYear=20$(echo $GCCDATE | cut -c1-2)
 gccVersionMonth=$(echo $GCCDATE | cut -c3-4)
@@ -125,6 +131,13 @@
 
 cd /boot
 zip -ry "$packageFile" `echo $installDir | cut -d/ -f3-`
+
+
+# add the "current" version symlink
+cd "$buildDir"
+mkdir -p develop/abi/x86/gcc4/tools/
+ln -s $gccVersionedName develop/abi/x86/gcc4/tools/current
+zip -y "$packageFile" develop/abi/x86/gcc4/tools/current
 
 
 # add the optional package description
--
gitore 0.2.3