mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-04-16 01:39:27 +02:00
+ Small fix for classes.pp
This commit is contained in:
parent
2737e8d599
commit
1e3ac92d39
@ -1,5 +1,5 @@
|
||||
#
|
||||
# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/07]
|
||||
# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/12]
|
||||
#
|
||||
default: help
|
||||
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos 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-sunos x86_64-linux x86_64-freebsd arm-linux
|
||||
@ -1102,16 +1102,12 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPP
|
||||
endif
|
||||
ifdef INSTALLPPUFILES
|
||||
override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
|
||||
ifneq ($(UNITTARGETDIRPREFIX),)
|
||||
override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))
|
||||
override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
|
||||
endif
|
||||
override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILES))
|
||||
override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPULINKFILES)))
|
||||
override INSTALL_CREATEPACKAGEFPC=1
|
||||
endif
|
||||
ifdef INSTALLEXEFILES
|
||||
ifneq ($(TARGETDIRPREFIX),)
|
||||
override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(notdir $(INSTALLEXEFILES)))
|
||||
endif
|
||||
override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
|
||||
endif
|
||||
fpc_install: all $(INSTALLTARGET)
|
||||
ifdef INSTALLEXEFILES
|
||||
@ -1125,7 +1121,7 @@ ifdef INSTALL_CREATEPACKAGEFPC
|
||||
ifdef FPCMAKE
|
||||
ifdef PACKAGE_VERSION
|
||||
ifneq ($(wildcard Makefile.fpc),)
|
||||
$(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc
|
||||
$(FPCMAKE) -p -T$(OS_TARGET) Makefile.fpc
|
||||
$(MKDIR) $(INSTALL_UNITDIR)
|
||||
$(INSTALL) Package.fpc $(INSTALL_UNITDIR)
|
||||
endif
|
||||
@ -1581,11 +1577,8 @@ endif
|
||||
ifeq ($(findstring darwin,$(OS_SOURCE)),)
|
||||
override SYSTEMUNITDIR=bsd
|
||||
endif
|
||||
ifneq ($(findstring $(OS_SOURCE),linux freebsd darwin netbsd openbsd),)
|
||||
CLASSESUNITDIR=unix
|
||||
else
|
||||
HOSTOS=$(OS_SOURCE)
|
||||
CLASSESUNITDIR=$(OS_SOURCE)
|
||||
endif
|
||||
FCLOPTS=--package=fcl --descr=classes.xml --input='$(FPCSRCDIR)/rtl/$(OS_SOURCE)/classes.pp -Fi$(FPCSRCDIR)/rtl/objpas/classes'
|
||||
fcl.inc: classes.xml
|
||||
$(FPDOC) --output=fcl.inc $(FCLOPTS) --format=latex
|
||||
|
@ -255,13 +255,14 @@ endif
|
||||
ifeq ($(findstring darwin,$(OS_SOURCE)),)
|
||||
override SYSTEMUNITDIR=bsd
|
||||
endif
|
||||
HOSTOS=$(OS_SOURCE)
|
||||
|
||||
# Classes.pp is in rtl/unix/ for several targets
|
||||
ifneq ($(findstring $(OS_SOURCE),linux freebsd darwin netbsd openbsd),)
|
||||
CLASSESUNITDIR=unix
|
||||
else
|
||||
#ifneq ($(findstring $(OS_SOURCE),linux freebsd darwin netbsd openbsd),)
|
||||
#CLASSESUNITDIR=unix
|
||||
#else
|
||||
CLASSESUNITDIR=$(OS_SOURCE)
|
||||
endif
|
||||
#endif
|
||||
|
||||
FCLOPTS=--package=fcl --descr=classes.xml --input='$(FPCSRCDIR)/rtl/$(OS_SOURCE)/classes.pp -Fi$(FPCSRCDIR)/rtl/objpas/classes'
|
||||
|
||||
@ -565,7 +566,10 @@ execute:
|
||||
|
||||
#
|
||||
# $Log$
|
||||
# Revision 1.4 2005-02-07 20:39:19 peter
|
||||
# Revision 1.5 2005-02-07 21:05:58 michael
|
||||
# + Small fix for classes.pp
|
||||
#
|
||||
# Revision 1.4 2005/02/07 20:39:19 peter
|
||||
# fix zip names
|
||||
#
|
||||
# Revision 1.3 2005/02/06 21:02:12 peter
|
||||
|
Loading…
Reference in New Issue
Block a user