paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-12 08:27:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ Fixed detection of rpm dir (By colin Western)

Browse Source
This commit is contained in:
michael 2004-05-27 21:47:14 +00:00
parent 23c89ea193
commit 5ddc5782e1
2 changed files with 87 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

250
Makefile
View File

@ -1,25 +1,15 @@
# #
# Don't edit, this file is generated by FPCMake Version 1.1 [2004/05/23] # Don't edit, this file is generated by FPCMake Version 1.1 [2003/09/24]
# #
default: help default: help
MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx
BSDs = freebsd netbsd openbsd darwin override PATH:=$(subst \,/,$(PATH))
UNIXs = linux $(BSDs) sunos qnx
FORCE:
.PHONY: FORCE
override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH)))
ifneq ($(findstring darwin,$(OSTYPE)),)
inUnix=1 #darwin
SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH)))
else
ifeq ($(findstring ;,$(PATH)),) ifeq ($(findstring ;,$(PATH)),)
inUnix=1 inUnix=1
SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH))) SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH)))
else else
SEARCHPATH:=$(subst ;, ,$(PATH)) SEARCHPATH:=$(subst ;, ,$(PATH))
endif endif
endif
SEARCHPATH+=$(patsubst %/,%,$(subst \,/,$(dir $(MAKE))))
PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH)))) PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
ifeq ($(PWD),) ifeq ($(PWD),)
PWD:=$(strip $(wildcard $(addsuffix /pwd,$(SEARCHPATH)))) PWD:=$(strip $(wildcard $(addsuffix /pwd,$(SEARCHPATH))))
@ -46,13 +36,22 @@ ifneq ($(findstring cygdrive,$(PATH)),)
inCygWin=1 inCygWin=1
endif endif
endif endif
ifeq ($(OS_TARGET),freebsd)
BSDhier=1
endif
ifeq ($(OS_TARGET),netbsd)
BSDhier=1
endif
ifeq ($(OS_TARGET),openbsd)
BSDhier=1
endif
ifdef inUnix ifdef inUnix
SRCBATCHEXT=.sh BATCHEXT=.sh
else else
ifdef inOS2 ifdef inOS2
SRCBATCHEXT=.cmd BATCHEXT=.cmd
else else
SRCBATCHEXT=.bat BATCHEXT=.bat
endif endif
endif endif
ifdef inUnix ifdef inUnix
@ -155,12 +154,6 @@ ifeq ($(findstring $(OS_TARGET),$(MAKEFILETARGETS)),)
$(error The Makefile doesn't support target $(OS_TARGET), please run fpcmake first) $(error The Makefile doesn't support target $(OS_TARGET), please run fpcmake first)
endif endif
endif endif
ifneq ($(findstring $(OS_TARGET),$(BSDs)),)
BSDhier=1
endif
ifeq ($(OS_TARGET),linux)
linuxHier=1
endif
export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE CROSSCOMPILE export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE CROSSCOMPILE
ifdef FPCDIR ifdef FPCDIR
override FPCDIR:=$(subst \,/,$(FPCDIR)) override FPCDIR:=$(subst \,/,$(FPCDIR))
@ -190,14 +183,11 @@ override FPCDIR:=$(FPCDIR)/..
ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
override FPCDIR:=$(FPCDIR)/.. override FPCDIR:=$(FPCDIR)/..
ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
override FPCDIR:=$(BASEDIR)
ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
override FPCDIR=c:/pp override FPCDIR=c:/pp
endif endif
endif endif
endif endif
endif endif
endif
ifndef CROSSDIR ifndef CROSSDIR
CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET) CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
endif endif
@ -315,12 +305,42 @@ ifdef REQUIRE_PACKAGESDIR
override PACKAGESDIR+=$(REQUIRE_PACKAGESDIR) override PACKAGESDIR+=$(REQUIRE_PACKAGESDIR)
endif endif
ifdef ZIPINSTALL ifdef ZIPINSTALL
ifneq ($(findstring $(OS_TARGET),$(UNIXs)),) ifeq ($(OS_TARGET),linux)
UNIXHier=1 UNIXINSTALLDIR=1
endif
ifeq ($(OS_TARGET),freebsd)
UNIXINSTALLDIR=1
endif
ifeq ($(OS_TARGET),netbsd)
UNIXINSTALLDIR=1
endif
ifeq ($(OS_TARGET),openbsd)
UNIXINSTALLDIR=1
endif
ifeq ($(OS_TARGET),sunos)
UNIXINSTALLDIR=1
endif
ifeq ($(OS_TARGET),qnx)
UNIXINSTALLDIR=1
endif endif
else else
ifneq ($(findstring $(OS_SOURCE),$(UNIXs)),) ifeq ($(OS_SOURCE),linux)
UNIXHier=1 UNIXINSTALLDIR=1
endif
ifeq ($(OS_SOURCE),freebsd)
UNIXINSTALLDIR=1
endif
ifeq ($(OS_SOURCE),netbsd)
UNIXINSTALLDIR=1
endif
ifeq ($(OS_SOURCE),openbsd)
UNIXINSTALLDIR=1
endif
ifeq ($(OS_TARGET),sunos)
UNIXINSTALLDIR=1
endif
ifeq ($(OS_TARGET),qnx)
UNIXINSTALLDIR=1
endif endif
endif endif
ifndef INSTALL_PREFIX ifndef INSTALL_PREFIX
@ -329,7 +349,7 @@ INSTALL_PREFIX=$(PREFIX)
endif endif
endif endif
ifndef INSTALL_PREFIX ifndef INSTALL_PREFIX
ifdef UNIXHier ifdef UNIXINSTALLDIR
INSTALL_PREFIX=/usr/local INSTALL_PREFIX=/usr/local
else else
ifdef INSTALL_FPCPACKAGE ifdef INSTALL_FPCPACKAGE
@ -348,7 +368,7 @@ DIST_DESTDIR:=$(BASEDIR)
endif endif
export DIST_DESTDIR export DIST_DESTDIR
ifndef INSTALL_BASEDIR ifndef INSTALL_BASEDIR
ifdef UNIXHier ifdef UNIXINSTALLDIR
ifdef INSTALL_FPCPACKAGE ifdef INSTALL_FPCPACKAGE
INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION) INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
else else
@ -359,18 +379,10 @@ INSTALL_BASEDIR:=$(INSTALL_PREFIX)
endif endif
endif endif
ifndef INSTALL_BINDIR ifndef INSTALL_BINDIR
ifdef UNIXHier ifdef UNIXINSTALLDIR
ifdef CROSSCOMPILE
INSTALL_BINDIR:=$(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin
else
INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
endif
else
ifdef CROSSCOMPILE
INSTALL_BINDIR:=$(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin
else else
INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
endif
ifdef INSTALL_FPCPACKAGE ifdef INSTALL_FPCPACKAGE
INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET) INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
endif endif
@ -389,23 +401,19 @@ endif
endif endif
endif endif
ifndef INSTALL_LIBDIR ifndef INSTALL_LIBDIR
ifdef UNIXHier ifdef UNIXINSTALLDIR
INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
else else
INSTALL_LIBDIR:=$(INSTALL_UNITDIR) INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
endif endif
endif endif
ifndef INSTALL_SOURCEDIR ifndef INSTALL_SOURCEDIR
ifdef UNIXHier ifdef UNIXINSTALLDIR
ifdef BSDhier ifdef BSDhier
SRCPREFIXDIR=share/src SRCPREFIXDIR=share/src
else else
ifdef linuxHier
SRCPREFIXDIR=share/src
else
SRCPREFIXDIR=src SRCPREFIXDIR=src
endif endif
endif
ifdef INSTALL_FPCPACKAGE ifdef INSTALL_FPCPACKAGE
ifdef INSTALL_FPCSUBDIR ifdef INSTALL_FPCSUBDIR
INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION)/$(INSTALL_FPCSUBDIR)/$(PACKAGE_NAME) INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION)/$(INSTALL_FPCSUBDIR)/$(PACKAGE_NAME)
@ -428,16 +436,12 @@ endif
endif endif
endif endif
ifndef INSTALL_DOCDIR ifndef INSTALL_DOCDIR
ifdef UNIXHier ifdef UNIXINSTALLDIR
ifdef BSDhier ifdef BSDhier
DOCPREFIXDIR=share/doc DOCPREFIXDIR=share/doc
else else
ifdef linuxHier
DOCPREFIXDIR=share/doc
else
DOCPREFIXDIR=doc DOCPREFIXDIR=doc
endif endif
endif
ifdef INSTALL_FPCPACKAGE ifdef INSTALL_FPCPACKAGE
INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/fpc-$(FPC_VERSION)/$(PACKAGE_NAME) INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
else else
@ -452,28 +456,20 @@ endif
endif endif
endif endif
ifndef INSTALL_EXAMPLEDIR ifndef INSTALL_EXAMPLEDIR
ifdef UNIXHier ifdef UNIXINSTALLDIR
ifdef INSTALL_FPCPACKAGE ifdef INSTALL_FPCPACKAGE
ifdef BSDhier ifdef BSDhier
INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/fpc-$(FPC_VERSION)/$(PACKAGE_NAME) INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
else else
ifdef linuxHier
INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples
else
INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME) INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
endif endif
endif
else else
ifdef BSDhier ifdef BSDhier
INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/$(PACKAGE_NAME)-$(PACKAGE_VERSION) INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
else else
ifdef linuxHier
INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
else
INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION) INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
endif endif
endif endif
endif
else else
ifdef INSTALL_FPCPACKAGE ifdef INSTALL_FPCPACKAGE
INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME) INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
@ -495,7 +491,6 @@ endif
else else
CROSSBINDIR= CROSSBINDIR=
endif endif
BATCHEXT=.bat
LOADEREXT=.as LOADEREXT=.as
EXEEXT=.exe EXEEXT=.exe
PPLEXT=.ppl PPLEXT=.ppl
@ -519,37 +514,25 @@ STATICLIBPREFIX=
FPCMADE=fpcmade.dos FPCMADE=fpcmade.dos
ZIPSUFFIX=go32 ZIPSUFFIX=go32
endif endif
ifeq ($(OS_TARGET),watcom)
STATICLIBPREFIX=
FPCMADE=fpcmade.wat
ZIPSUFFIX=watc
OEXT=.obj
ASMEXT=.asm
SHAREDLIBEXT=.dll
endif
ifeq ($(OS_TARGET),linux) ifeq ($(OS_TARGET),linux)
BATCHEXT=.sh
EXEEXT= EXEEXT=
HASSHAREDLIB=1 HASSHAREDLIB=1
FPCMADE=fpcmade.lnx FPCMADE=fpcmade.lnx
ZIPSUFFIX=linux ZIPSUFFIX=linux
endif endif
ifeq ($(OS_TARGET),freebsd) ifeq ($(OS_TARGET),freebsd)
BATCHEXT=.sh
EXEEXT= EXEEXT=
HASSHAREDLIB=1 HASSHAREDLIB=1
FPCMADE=fpcmade.freebsd FPCMADE=fpcmade.freebsd
ZIPSUFFIX=freebsd ZIPSUFFIX=freebsd
endif endif
ifeq ($(OS_TARGET),netbsd) ifeq ($(OS_TARGET),netbsd)
BATCHEXT=.sh
EXEEXT= EXEEXT=
HASSHAREDLIB=1 HASSHAREDLIB=1
FPCMADE=fpcmade.netbsd FPCMADE=fpcmade.netbsd
ZIPSUFFIX=netbsd ZIPSUFFIX=netbsd
endif endif
ifeq ($(OS_TARGET),openbsd) ifeq ($(OS_TARGET),openbsd)
BATCHEXT=.sh
EXEEXT= EXEEXT=
HASSHAREDLIB=1 HASSHAREDLIB=1
FPCMADE=fpcmade.openbsd FPCMADE=fpcmade.openbsd
@ -561,7 +544,6 @@ FPCMADE=fpcmade.w32
ZIPSUFFIX=w32 ZIPSUFFIX=w32
endif endif
ifeq ($(OS_TARGET),os2) ifeq ($(OS_TARGET),os2)
BATCHEXT=.cmd
AOUTEXT=.out AOUTEXT=.out
STATICLIBPREFIX= STATICLIBPREFIX=
SHAREDLIBEXT=.dll SHAREDLIBEXT=.dll
@ -570,7 +552,6 @@ ZIPSUFFIX=os2
ECHO=echo ECHO=echo
endif endif
ifeq ($(OS_TARGET),emx) ifeq ($(OS_TARGET),emx)
BATCHEXT=.cmd
AOUTEXT=.out AOUTEXT=.out
STATICLIBPREFIX= STATICLIBPREFIX=
SHAREDLIBEXT=.dll SHAREDLIBEXT=.dll
@ -588,19 +569,16 @@ EXEEXT=.ttp
FPCMADE=fpcmade.ata FPCMADE=fpcmade.ata
endif endif
ifeq ($(OS_TARGET),beos) ifeq ($(OS_TARGET),beos)
BATCHEXT=.sh
EXEEXT= EXEEXT=
FPCMADE=fpcmade.be FPCMADE=fpcmade.be
ZIPSUFFIX=be ZIPSUFFIX=be
endif endif
ifeq ($(OS_TARGET),sunos) ifeq ($(OS_TARGET),sunos)
BATCHEXT=.sh
EXEEXT= EXEEXT=
FPCMADE=fpcmade.sun FPCMADE=fpcmade.sun
ZIPSUFFIX=sun ZIPSUFFIX=sun
endif endif
ifeq ($(OS_TARGET),qnx) ifeq ($(OS_TARGET),qnx)
BATCHEXT=.sh
EXEEXT= EXEEXT=
FPCMADE=fpcmade.qnx FPCMADE=fpcmade.qnx
ZIPSUFFIX=qnx ZIPSUFFIX=qnx
@ -612,14 +590,10 @@ FPCMADE=fpcmade.nw
ZIPSUFFIX=nw ZIPSUFFIX=nw
endif endif
ifeq ($(OS_TARGET),macos) ifeq ($(OS_TARGET),macos)
BATCHEXT=
EXEEXT= EXEEXT=
FPCMADE=fpcmade.macos FPCMADE=fpcmade.mcc
ZIPSUFFIX=macos
DEBUGSYMEXT=.xcoff
endif endif
ifeq ($(OS_TARGET),darwin) ifeq ($(OS_TARGET),darwin)
BATCHEXT=.sh
EXEEXT= EXEEXT=
HASSHAREDLIB=1 HASSHAREDLIB=1
FPCMADE=fpcmade.darwin FPCMADE=fpcmade.darwin
@ -642,34 +616,25 @@ STATICLIBPREFIX=
FPCMADE=fpcmade.dos FPCMADE=fpcmade.dos
ZIPSUFFIX=go32 ZIPSUFFIX=go32
endif endif
ifeq ($(OS_TARGET),watcom)
STATICLIBPREFIX=
FPCMADE=fpcmade.dos
ZIPSUFFIX=watcom
endif
ifeq ($(OS_TARGET),linux) ifeq ($(OS_TARGET),linux)
BATCHEXT=.sh
EXEEXT= EXEEXT=
HASSHAREDLIB=1 HASSHAREDLIB=1
FPCMADE=fpcmade.lnx FPCMADE=fpcmade.lnx
ZIPSUFFIX=linux ZIPSUFFIX=linux
endif endif
ifeq ($(OS_TARGET),freebsd) ifeq ($(OS_TARGET),freebsd)
BATCHEXT=.sh
EXEEXT= EXEEXT=
HASSHAREDLIB=1 HASSHAREDLIB=1
FPCMADE=fpcmade.freebsd FPCMADE=fpcmade.freebsd
ZIPSUFFIX=freebsd ZIPSUFFIX=freebsd
endif endif
ifeq ($(OS_TARGET),netbsd) ifeq ($(OS_TARGET),netbsd)
BATCHEXT=.sh
EXEEXT= EXEEXT=
HASSHAREDLIB=1 HASSHAREDLIB=1
FPCMADE=fpcmade.netbsd FPCMADE=fpcmade.netbsd
ZIPSUFFIX=netbsd ZIPSUFFIX=netbsd
endif endif
ifeq ($(OS_TARGET),openbsd) ifeq ($(OS_TARGET),openbsd)
BATCHEXT=.sh
EXEEXT= EXEEXT=
HASSHAREDLIB=1 HASSHAREDLIB=1
FPCMADE=fpcmade.openbsd FPCMADE=fpcmade.openbsd
@ -686,7 +651,6 @@ FPCMADE=fpcmade.w32
ZIPSUFFIX=w32 ZIPSUFFIX=w32
endif endif
ifeq ($(OS_TARGET),os2) ifeq ($(OS_TARGET),os2)
BATCHEXT=.cmd
PPUEXT=.ppo PPUEXT=.ppo
ASMEXT=.so2 ASMEXT=.so2
OEXT=.oo2 OEXT=.oo2
@ -719,7 +683,6 @@ EXEEXT=.ttp
FPCMADE=fpcmade.ata FPCMADE=fpcmade.ata
endif endif
ifeq ($(OS_TARGET),beos) ifeq ($(OS_TARGET),beos)
BATCHEXT=.sh
PPUEXT=.ppu PPUEXT=.ppu
ASMEXT=.s ASMEXT=.s
OEXT=.o OEXT=.o
@ -730,7 +693,6 @@ FPCMADE=fpcmade.be
ZIPSUFFIX=be ZIPSUFFIX=be
endif endif
ifeq ($(OS_TARGET),sunos) ifeq ($(OS_TARGET),sunos)
BATCHEXT=.sh
PPUEXT=.ppu PPUEXT=.ppu
ASMEXT=.s ASMEXT=.s
OEXT=.o OEXT=.o
@ -741,7 +703,6 @@ FPCMADE=fpcmade.sun
ZIPSUFFIX=sun ZIPSUFFIX=sun
endif endif
ifeq ($(OS_TARGET),qnx) ifeq ($(OS_TARGET),qnx)
BATCHEXT=.sh
PPUEXT=.ppu PPUEXT=.ppu
ASMEXT=.s ASMEXT=.s
OEXT=.o OEXT=.o
@ -764,15 +725,13 @@ ZIPSUFFIX=nw
EXEEXT=.nlm EXEEXT=.nlm
endif endif
ifeq ($(OS_TARGET),macos) ifeq ($(OS_TARGET),macos)
BATCHEXT=
PPUEXT=.ppu PPUEXT=.ppu
ASMEXT=.s ASMEXT=.s
OEXT=.o OEXT=.o
SMARTEXT=.sl SMARTEXT=.sl
STATICLIBEXT=.a STATICLIBEXT=.a
EXEEXT= EXEEXT=
DEBUGSYMEXT=.xcoff FPCMADE=fpcmade.mcc
FPCMADE=fpcmade.macos
endif endif
endif endif
ifndef ECHO ifndef ECHO
@ -780,7 +739,7 @@ ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(ECHO),) ifeq ($(ECHO),)
ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH)))) ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(ECHO),) ifeq ($(ECHO),)
ECHO= __missing_command__ ECHO=
else else
ECHO:=$(firstword $(ECHO)) ECHO:=$(firstword $(ECHO))
endif endif
@ -794,7 +753,7 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(DATE),) ifeq ($(DATE),)
DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH)))) DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(DATE),) ifeq ($(DATE),)
DATE= __missing_command__ DATE=
else else
DATE:=$(firstword $(DATE)) DATE:=$(firstword $(DATE))
endif endif
@ -808,7 +767,7 @@ GINSTALL:=$(strip $(wildcard $(addsuffix /ginstall$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(GINSTALL),) ifeq ($(GINSTALL),)
GINSTALL:=$(strip $(wildcard $(addsuffix /install$(SRCEXEEXT),$(SEARCHPATH)))) GINSTALL:=$(strip $(wildcard $(addsuffix /install$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(GINSTALL),) ifeq ($(GINSTALL),)
GINSTALL= __missing_command__ GINSTALL=
else else
GINSTALL:=$(firstword $(GINSTALL)) GINSTALL:=$(firstword $(GINSTALL))
endif endif
@ -820,7 +779,7 @@ export GINSTALL
ifndef CPPROG ifndef CPPROG
CPPROG:=$(strip $(wildcard $(addsuffix /cp$(SRCEXEEXT),$(SEARCHPATH)))) CPPROG:=$(strip $(wildcard $(addsuffix /cp$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(CPPROG),) ifeq ($(CPPROG),)
CPPROG= __missing_command__ CPPROG=
else else
CPPROG:=$(firstword $(CPPROG)) CPPROG:=$(firstword $(CPPROG))
endif endif
@ -829,7 +788,7 @@ export CPPROG
ifndef RMPROG ifndef RMPROG
RMPROG:=$(strip $(wildcard $(addsuffix /rm$(SRCEXEEXT),$(SEARCHPATH)))) RMPROG:=$(strip $(wildcard $(addsuffix /rm$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(RMPROG),) ifeq ($(RMPROG),)
RMPROG= __missing_command__ RMPROG=
else else
RMPROG:=$(firstword $(RMPROG)) RMPROG:=$(firstword $(RMPROG))
endif endif
@ -838,18 +797,14 @@ export RMPROG
ifndef MVPROG ifndef MVPROG
MVPROG:=$(strip $(wildcard $(addsuffix /mv$(SRCEXEEXT),$(SEARCHPATH)))) MVPROG:=$(strip $(wildcard $(addsuffix /mv$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(MVPROG),) ifeq ($(MVPROG),)
MVPROG= __missing_command__ MVPROG=
else else
MVPROG:=$(firstword $(MVPROG)) MVPROG:=$(firstword $(MVPROG))
endif endif
endif endif
export MVPROG export MVPROG
ifndef ECHOREDIR ifndef ECHOREDIR
ifndef inUnix ECHOREDIR:=$(subst /,$(PATHSEP),$(ECHO))
ECHOREDIR=echo
else
ECHOREDIR=$(ECHO)
endif
endif endif
ifndef COPY ifndef COPY
COPY:=$(CPPROG) -fp COPY:=$(CPPROG) -fp
@ -887,7 +842,7 @@ export ECHOREDIR COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
ifndef PPUMOVE ifndef PPUMOVE
PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH)))) PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(PPUMOVE),) ifeq ($(PPUMOVE),)
PPUMOVE= __missing_command__ PPUMOVE=
else else
PPUMOVE:=$(firstword $(PPUMOVE)) PPUMOVE:=$(firstword $(PPUMOVE))
endif endif
@ -896,7 +851,7 @@ export PPUMOVE
ifndef FPCMAKE ifndef FPCMAKE
FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH)))) FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(FPCMAKE),) ifeq ($(FPCMAKE),)
FPCMAKE= __missing_command__ FPCMAKE=
else else
FPCMAKE:=$(firstword $(FPCMAKE)) FPCMAKE:=$(firstword $(FPCMAKE))
endif endif
@ -905,7 +860,7 @@ export FPCMAKE
ifndef ZIPPROG ifndef ZIPPROG
ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(SRCEXEEXT),$(SEARCHPATH)))) ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(ZIPPROG),) ifeq ($(ZIPPROG),)
ZIPPROG= __missing_command__ ZIPPROG=
else else
ZIPPROG:=$(firstword $(ZIPPROG)) ZIPPROG:=$(firstword $(ZIPPROG))
endif endif
@ -914,25 +869,21 @@ export ZIPPROG
ifndef TARPROG ifndef TARPROG
TARPROG:=$(strip $(wildcard $(addsuffix /tar$(SRCEXEEXT),$(SEARCHPATH)))) TARPROG:=$(strip $(wildcard $(addsuffix /tar$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(TARPROG),) ifeq ($(TARPROG),)
TARPROG= __missing_command__ TARPROG=
else else
TARPROG:=$(firstword $(TARPROG)) TARPROG:=$(firstword $(TARPROG))
endif endif
endif endif
export TARPROG export TARPROG
ASNAME=$(BINUTILSPREFIX)as ASNAME=as
LDNAME=$(BINUTILSPREFIX)ld LDNAME=ld
ARNAME=$(BINUTILSPREFIX)ar ARNAME=ar
RCNAME=$(BINUTILSPREFIX)rc RCNAME=rc
ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
ifeq ($(OS_TARGET),win32) ifeq ($(OS_TARGET),win32)
ifeq ($(CROSSBINDIR),)
ASNAME=asw ASNAME=asw
LDNAME=ldw LDNAME=ldw
ARNAME=arw ARNAME=arw
endif endif
endif
endif
ifndef ASPROG ifndef ASPROG
ifdef CROSSBINDIR ifdef CROSSBINDIR
ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
@ -965,7 +916,7 @@ AS=$(ASPROG)
LD=$(LDPROG) LD=$(LDPROG)
RC=$(RCPROG) RC=$(RCPROG)
AR=$(ARPROG) AR=$(ARPROG)
PPAS=ppas$(SRCBATCHEXT) PPAS=ppas$(BATCHEXT)
ifdef inUnix ifdef inUnix
LDCONFIG=ldconfig LDCONFIG=ldconfig
else else
@ -1030,11 +981,6 @@ ifeq ($(CPU_TARGET),x86_64)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
endif endif
endif endif
ifeq ($(OS_TARGET),linux)
ifeq ($(CPU_TARGET),arm)
REQUIRE_PACKAGES_RTL=1
endif
endif
ifeq ($(OS_TARGET),go32v2) ifeq ($(OS_TARGET),go32v2)
ifeq ($(CPU_TARGET),i386) ifeq ($(CPU_TARGET),i386)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
@ -1060,11 +1006,6 @@ ifeq ($(CPU_TARGET),m68k)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
endif endif
endif endif
ifeq ($(OS_TARGET),freebsd)
ifeq ($(CPU_TARGET),x86_64)
REQUIRE_PACKAGES_RTL=1
endif
endif
ifeq ($(OS_TARGET),beos) ifeq ($(OS_TARGET),beos)
ifeq ($(CPU_TARGET),i386) ifeq ($(CPU_TARGET),i386)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
@ -1080,16 +1021,6 @@ ifeq ($(CPU_TARGET),m68k)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
endif endif
endif endif
ifeq ($(OS_TARGET),netbsd)
ifeq ($(CPU_TARGET),powerpc)
REQUIRE_PACKAGES_RTL=1
endif
endif
ifeq ($(OS_TARGET),netbsd)
ifeq ($(CPU_TARGET),sparc)
REQUIRE_PACKAGES_RTL=1
endif
endif
ifeq ($(OS_TARGET),amiga) ifeq ($(OS_TARGET),amiga)
ifeq ($(CPU_TARGET),m68k) ifeq ($(CPU_TARGET),m68k)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
@ -1155,11 +1086,6 @@ ifeq ($(CPU_TARGET),i386)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
endif endif
endif endif
ifeq ($(OS_TARGET),watcom)
ifeq ($(CPU_TARGET),i386)
REQUIRE_PACKAGES_RTL=1
endif
endif
ifdef REQUIRE_PACKAGES_RTL ifdef REQUIRE_PACKAGES_RTL
PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/$(OS_TARGET)/Makefile.fpc,$(PACKAGESDIR)))))) PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/$(OS_TARGET)/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_RTL),) ifneq ($(PACKAGEDIR_RTL),)
@ -1195,14 +1121,6 @@ endif
ifeq ($(OS_SOURCE),openbsd) ifeq ($(OS_SOURCE),openbsd)
override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCOPT+=-FD$(NEW_BINUTILS_PATH)
endif endif
ifndef CROSSBOOTSTRAP
ifneq ($(BINUTILSPREFIX),)
override FPCOPT+=-XP$(BINUTILSPREFIX) -Xc
endif
ifneq ($(BINUTILSPREFIX),)
override FPCOPT+=-Xr$(RLINKPATH)
endif
endif
ifdef UNITDIR ifdef UNITDIR
override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
endif endif
@ -1229,12 +1147,8 @@ ifdef RELEASE
ifeq ($(CPU_TARGET),i386) ifeq ($(CPU_TARGET),i386)
FPCCPUOPT:=-OG2p3 FPCCPUOPT:=-OG2p3
else else
ifeq ($(CPU_TARGET),powerpc)
FPCCPUOPT:=-O1
else
FPCCPUOPT:= FPCCPUOPT:=
endif endif
endif
override FPCOPT+=-Xs $(FPCCPUOPT) -n override FPCOPT+=-Xs $(FPCCPUOPT) -n
override FPCOPTDEF+=RELEASE override FPCOPTDEF+=RELEASE
endif endif
@ -1419,7 +1333,7 @@ USEZIPWRAPPER=1
endif endif
ifdef USEZIPWRAPPER ifdef USEZIPWRAPPER
ZIPPATHSEP=$(PATHSEP) ZIPPATHSEP=$(PATHSEP)
ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT)) ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(BATCHEXT))
else else
ZIPPATHSEP=/ ZIPPATHSEP=/
endif endif
@ -1473,9 +1387,6 @@ override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))
endif endif
ifdef CLEANPPUFILES ifdef CLEANPPUFILES
override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))
ifdef DEBUGSYMEXT
override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPPUFILES))
endif
override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILES)) override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILES))
override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILES))) override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILES)))
endif endif
@ -1499,7 +1410,6 @@ ifdef LIB_NAME
-$(DEL) $(LIB_NAME) $(LIB_FULLNAME) -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
endif endif
-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE) -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
-$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)
fpc_distclean: clean fpc_distclean: clean
ifdef COMPILER_UNITTARGETDIR ifdef COMPILER_UNITTARGETDIR
TARGETDIRCLEAN=fpc_clean TARGETDIRCLEAN=fpc_clean
@ -1511,13 +1421,9 @@ endif
-$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
-$(DELTREE) *$(SMARTEXT) -$(DELTREE) *$(SMARTEXT)
-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE) -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
-$(DEL) *_ppas$(BATCHEXT)
ifdef AOUTEXT ifdef AOUTEXT
-$(DEL) *$(AOUTEXT) -$(DEL) *$(AOUTEXT)
endif endif
ifdef DEBUGSYMEXT
-$(DEL) *$(DEBUGSYMEXT)
endif
.PHONY: fpc_baseinfo .PHONY: fpc_baseinfo
override INFORULES+=fpc_baseinfo override INFORULES+=fpc_baseinfo
fpc_baseinfo: fpc_baseinfo:
@ -2220,10 +2126,16 @@ RPMBUILD=$(strip $(wildcard $(addsuffix /rpmbuild,$(SEARCHPATH))))
ifeq ($(RPMBUILD),) ifeq ($(RPMBUILD),)
RPMBUILD=$(strip $(wildcard $(addsuffix /rpm,$(SEARCHPATH)))) RPMBUILD=$(strip $(wildcard $(addsuffix /rpm,$(SEARCHPATH))))
endif endif
REDHATDIR=$(shell rpm --eval=%_topdir)
ifeq ($(REDHATDIR),%_topdir)
REDHATDIR=
endif
ifeq ($(REDHATDIR),)
REDHATDIR=/usr/src/redhat REDHATDIR=/usr/src/redhat
ifeq ($(wildcard $(REDHATDIR)),) ifeq ($(wildcard $(REDHATDIR)),)
REDHATDIR=/usr/src/rpm REDHATDIR=/usr/src/rpm
endif endif
endif
RPMSOURCESDIR:=$(REDHATDIR)/SOURCES RPMSOURCESDIR:=$(REDHATDIR)/SOURCES
RPMSPECDIR:=$(REDHATDIR)/SPECS RPMSPECDIR:=$(REDHATDIR)/SPECS
RPMSRCDIR:=$(RPMSOURCESDIR)/fpc RPMSRCDIR:=$(RPMSOURCESDIR)/fpc

6
Makefile.fpc
View File

@ -523,11 +523,17 @@ RPMBUILD=$(strip $(wildcard $(addsuffix /rpmbuild,$(SEARCHPATH))))
ifeq ($(RPMBUILD),) ifeq ($(RPMBUILD),)
RPMBUILD=$(strip $(wildcard $(addsuffix /rpm,$(SEARCHPATH)))) RPMBUILD=$(strip $(wildcard $(addsuffix /rpm,$(SEARCHPATH))))
endif endif
REDHATDIR=$(shell rpm --eval=%_topdir)
ifeq ($(REDHATDIR),%_topdir)
REDHATDIR=
endif
ifeq ($(REDHATDIR),)
REDHATDIR=/usr/src/redhat REDHATDIR=/usr/src/redhat
# Debian has /usr/src/rpm # Debian has /usr/src/rpm
ifeq ($(wildcard $(REDHATDIR)),) ifeq ($(wildcard $(REDHATDIR)),)
REDHATDIR=/usr/src/rpm REDHATDIR=/usr/src/rpm
endif endif
endif
RPMSOURCESDIR:=$(REDHATDIR)/SOURCES RPMSOURCESDIR:=$(REDHATDIR)/SOURCES
RPMSPECDIR:=$(REDHATDIR)/SPECS RPMSPECDIR:=$(REDHATDIR)/SPECS
RPMSRCDIR:=$(RPMSOURCESDIR)/fpc RPMSRCDIR:=$(RPMSOURCESDIR)/fpc