瀏覽代碼

don't use ../data2inc it doesn't work for cross compiles
use data2inc only if it is available

peter 20 年之前
父節點
當前提交
dde36768ec
共有 2 個文件被更改,包括 5 次插入5 次删除
  1. 3 2
      utils/fpcm/Makefile
  2. 2 3
      utils/fpcm/Makefile.fpc

+ 3 - 2
utils/fpcm/Makefile

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

+ 2 - 3
utils/fpcm/Makefile.fpc

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