From c3d20ce12cd9cfbddb13a9a891f935446e346ff1 Mon Sep 17 00:00:00 2001 From: pierre Date: Tue, 16 Aug 2011 20:10:19 +0000 Subject: + Update all Makefile's modified by change in utils/fpcm/fpcmake.ini in prevous commit. Adapt also other files to that change: * compiler/globals.pas: Replace $FPCTARGET by os_string if tf_use_8_3 flag is set for target_info also. * tests/Makefile.fpc: Modify TEST_TARGETSUFFIX in the same way as TARGETSUFFIX was modified in previous commit. * tests/utils/dotest.pp: + New variable UseOSOnly, set to true if only target OS name should be used for subdirectories. git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@18228 3ad0048d-3df7-0310-abae-a5850022a9f2 --- packages/fcl-extra/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'packages/fcl-extra/Makefile') diff --git a/packages/fcl-extra/Makefile b/packages/fcl-extra/Makefile index c1f3e47dfa..dac94be87f 100644 --- a/packages/fcl-extra/Makefile +++ b/packages/fcl-extra/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/08/06] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/08/11] # default: all MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux @@ -188,7 +188,11 @@ ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) else +ifneq ($(findstring $(OS_TARGET),$(LIMIT83fs)),) +TARGETSUFFIX=$(OS_TARGET) +else TARGETSUFFIX=$(FULL_TARGET) +endif SOURCESUFFIX=$(FULL_SOURCE) endif ifneq ($(FULL_TARGET),$(FULL_SOURCE)) -- cgit v1.2.1