diff --git a/tools/install/cross_unix/HowToCreate_fpc_crosswin32_rpm.txt b/tools/install/cross_unix/HowToCreate_fpc_crosswin32_rpm.txt index c1f205a15b..67ed4f5973 100644 --- a/tools/install/cross_unix/HowToCreate_fpc_crosswin32_rpm.txt +++ b/tools/install/cross_unix/HowToCreate_fpc_crosswin32_rpm.txt @@ -2,7 +2,9 @@ How to create the fpc_crosswin32 rpm This rpm was only tested under linux. -For configuration see below. +The base directory is $BuildRoot. Default value is ~/freepascal + To change it use for example: + []$ export BuildRoot=/home/user/freepascal First get the FPC sources and the binutils. @@ -27,10 +29,3 @@ Then build the fpc_crosswin32 rpm and install it: Now you can cross compile from linux to win32. - -================================================================================ - -The following environment variables are handled: -The base directory BuildRoot. Default value is ~/freepascal - []$ export BuildRoot=/home/user/freepascal - diff --git a/tools/install/cross_unix/create_linux_cross_win32_rpm.sh b/tools/install/cross_unix/create_linux_cross_win32_rpm.sh index 699acbfe56..6f70d8a18c 100755 --- a/tools/install/cross_unix/create_linux_cross_win32_rpm.sh +++ b/tools/install/cross_unix/create_linux_cross_win32_rpm.sh @@ -110,7 +110,7 @@ if [ $BuildCrossWin32RPM = "yes" ]; then #---------------------------------------------------------------------------- # create temporary directory #---------------------------------------------------------------------------- - TmpSrcDir=/tmp/fpc_crosswin32 + TmpSrcDir=$HOME/tmp/fpc_crosswin32 echo "create temporary directory $TmpSrcDir ..." rm -rf $TmpSrcDir mkdir -p $TmpSrcDir @@ -139,9 +139,7 @@ if [ $BuildCrossWin32RPM = "yes" ]; then cd ${BinUtilsDir} for binutility in $(ls -B ${BinUtilsPrefix}*); do NewName=$(echo $binutility | sed -e "s#^$BinUtilsPrefix##") - if [ ! $NewName = "windres" ]; then - NewName="fpc-${TargetCPU}-${TargetOS}-$NewName" - fi + NewName="fpc-${TargetCPU}-${TargetOS}-$NewName" cp ${BinUtilsDir}${binutility} ${BinDir}${NewName} done cd - @@ -167,7 +165,7 @@ if [ $BuildCrossWin32RPM = "yes" ]; then # copy tools (windres) #---------------------------------------------------------------------------- FPCLibDir=lib/fpc/$CompilerVersionStr # !!! no / at end - DestDir=$FPCBuildDir/usr/$FPCLibDir + DestDir=$TmpSrcDir/$FPCLibDir cp -p $BuildRoot/bin/* $DestDir/ #----------------------------------------------------------------------------