paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-17 13:59:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

don't use ../data2inc it doesn't work for cross compiles

Browse Source 
use data2inc only if it is available
This commit is contained in:
peter 2005-04-25 07:41:51 +00:00
parent d2a6649813
commit dde36768ec
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
utils/fpcm/Makefile
View File

@ -1,5 +1,5 @@
#
# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/04/13]
# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/04/24]
#
default: all
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
@ -230,7 +230,6 @@ ifeq ($(UNITSDIR),)
UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
endif
PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
DATA2INC=../data2inc
ifeq ($(FULL_TARGET),i386-linux)
override TARGET_PROGRAMS+=fpcmake
endif
@ -2385,6 +2384,8 @@ makefiles: fpc_makefiles
ifneq ($(wildcard fpcmake.loc),)
include fpcmake.loc
endif
ifneq ($(DATA2INC),)
fpcmake.inc: fpcmake.ini
$(DATA2INC) -b -s fpcmake.ini fpcmake.inc fpcmakeini
endif
fpcmake$(EXEEXT): $(wildcard fpcm*.pp) fpcmake.inc

5
utils/fpcm/Makefile.fpc
View File

@ -19,11 +19,10 @@ fpcpackage=y
[default]
fpcdir=../..
[prerules]
DATA2INC=../data2inc
[rules]
ifneq ($(DATA2INC),)
fpcmake.inc: fpcmake.ini
$(DATA2INC) -b -s fpcmake.ini fpcmake.inc fpcmakeini
endif
fpcmake$(EXEEXT): $(wildcard fpcm*.pp) fpcmake.inc