2
0
Эх сурвалжийг харах

* fix for data2inc built by CVS

marco 20 жил өмнө
parent
commit
36faaa39b0

+ 3 - 2
utils/fpcm/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/04/13]
 #
 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,6 +230,7 @@ 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
@@ -1276,7 +1277,7 @@ export UPXPROG
 ZIPOPT=-9
 ZIPEXT=.zip
 ifeq ($(USETAR),bz2)
-TAROPT=vI
+TAROPT=vj
 TAREXT=.tar.bz2
 else
 TAROPT=vz

+ 3 - 0
utils/fpcm/Makefile.fpc

@@ -19,6 +19,9 @@ fpcpackage=y
 [default]
 fpcdir=../..
 
+[prerules]
+DATA2INC=../data2inc
+
 [rules]
 fpcmake.inc: fpcmake.ini
         $(DATA2INC) -b -s fpcmake.ini fpcmake.inc fpcmakeini