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 62cefbab37..95a7e7c908 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,7 @@ if [ $BuildCrossWin32DEB = "yes" ]; then cd ${BinUtilsDir} for binutility in $(ls -B ${BinUtilsPrefix}*); do NewName=$(echo $binutility | sed -e "s#^$BinUtilsPrefix##") - NewFileName="fpc-${TargetCPU}-${TargetOS}-$NewName" + NewFileName="${TargetCPU}-${TargetOS}-$NewName" if [ $NewName = "windres" ]; then # windres needs two names: # - the Makefiles expects without prefix fpc- @@ -216,7 +216,7 @@ if [ $BuildCrossWin32DEB = "yes" ]; then chmod a+x $DebianRulezDir/postinst fi - # create postinst if needed + # create postrm if needed if [ -f "$ResourceDir/postrm" ]; then echo "creating DEBIAN/postrm file" cat $ResourceDir/postrm | sed -e "s/FPCVERSION/$FPCVersion/g" > $DebianRulezDir/postrm diff --git a/tools/install/cross_unix/debian_crosswin32/changelog b/tools/install/cross_unix/debian_crosswin32/changelog index 357ac0fdf2..e51835e57e 100644 --- a/tools/install/cross_unix/debian_crosswin32/changelog +++ b/tools/install/cross_unix/debian_crosswin32/changelog @@ -1,3 +1,8 @@ +fpc-crosswin32 (2.2.2) + + * Tools are now installed without prefix fpc-. + For example i386-win32-windres. + fpc-crosswin32 (2.0.4) * Started package diff --git a/tools/install/cross_unix/debian_crosswin32/postinst b/tools/install/cross_unix/debian_crosswin32/postinst index 7697fe7694..3a848982a3 100755 --- a/tools/install/cross_unix/debian_crosswin32/postinst +++ b/tools/install/cross_unix/debian_crosswin32/postinst @@ -1,8 +1,8 @@ #!/bin/sh # add -FD and -XP entry for cross compiling -echo '# set binutils paths for crosscompiling # fpc_crosswin32' >> /etc/fpc.cfg -echo '#IFDEF FPC_CROSSCOMPILING # fpc_crosswin32' >> /etc/fpc.cfg -echo ' -XPfpc-i386-win32-' >> /etc/fpc.cfg -echo '#ENDIF # fpc_crosswin32' >> /etc/fpc.cfg +#echo '# set binutils paths for crosscompiling # fpc_crosswin32' >> /etc/fpc.cfg +#echo '#IFDEF NEEDCROSSBINUTILS # fpc_crosswin32' >> /etc/fpc.cfg +#echo ' -XPfpc-i386-win32-' >> /etc/fpc.cfg +#echo '#ENDIF # fpc_crosswin32' >> /etc/fpc.cfg # end.