From 3de400c818809a549529399e38dea24f50e3adf4 Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Tue, 26 Feb 2008 13:55:22 +0000
Subject: [PATCH] fpc-crosswin32 deb: fixed double copying tools, copying
 windres two times with different names

git-svn-id: trunk@14258 -
---
 .../cross_unix/create_linux_cross_win32_deb.sh   | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/tools/install/cross_unix/create_linux_cross_win32_deb.sh b/tools/install/cross_unix/create_linux_cross_win32_deb.sh
index a939e2be91..757a561488 100755
--- a/tools/install/cross_unix/create_linux_cross_win32_deb.sh
+++ b/tools/install/cross_unix/create_linux_cross_win32_deb.sh
@@ -160,7 +160,12 @@ if [ $BuildCrossWin32DEB = "yes" ]; then
     cd ${BinUtilsDir}
     for binutility in $(ls -B ${BinUtilsPrefix}*); do
       NewName=$(echo $binutility | sed -e "s#^$BinUtilsPrefix##")
-      if [ ! $NewName = "windres" ]; then
+      if [ $NewName = "windres" ]; then
+        # windres needs two names:
+        # - the Makefiles expects without prefix fpc-
+        # - the compiler expects 'windres' without any prefix
+        cp ${BinUtilsDir}${binutility} ${BinDir}${TargetCPU}-${TargetOS}-$NewName"
+      else
         NewName="fpc-${TargetCPU}-${TargetOS}-$NewName"
       fi
       cp ${BinUtilsDir}${binutility} ${BinDir}${NewName}
@@ -177,15 +182,8 @@ if [ $BuildCrossWin32DEB = "yes" ]; then
     
     DestDir=$FPCBuildDir/usr/$FPCLibDir
     mkdir -p $DestDir
-    cp -a $BuildRoot/binutils/cross/destination/$FPCLibDir/$Target $DestDir
+    cp -av $BuildRoot/binutils/cross/destination/$FPCLibDir/$Target $DestDir
   done
-
-  #----------------------------------------------------------------------------
-  # copy tools (windres)
-  #----------------------------------------------------------------------------
-  FPCLibDir=lib/fpc/$CompilerVersionStr # !!! no / at end
-  DestDir=$FPCBuildDir/usr/$FPCLibDir
-  cp -p $BuildRoot/bin/* $DestDir/
   
   #------------------------------------------------------------------------------
   # create rulez and files