paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-08 03:58:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

fpc-crosswin32 deb: fixed double copying tools, copying windres two times with different names

Browse Source 
git-svn-id: trunk@14258 -
This commit is contained in:
mattias 2008-02-26 13:55:22 +00:00
parent 326f4d17aa
commit 3de400c818
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/install/cross_unix/create_linux_cross_win32_deb.sh
View File

@ -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