mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-09-11 18:49:14 +02:00
* exeext is target dependent
* UNIXINSTALLDIR variable used for linux,freebsd targets (merged)
This commit is contained in:
parent
d2f13f099e
commit
00f34abe87
File diff suppressed because it is too large
Load Diff
@ -5,7 +5,7 @@
|
|||||||
[osdetect]
|
[osdetect]
|
||||||
#####################################################################
|
#####################################################################
|
||||||
# Autodetect OS (Linux or Dos or Windows NT)
|
# Autodetect OS (Linux or Dos or Windows NT)
|
||||||
# define inlinux when running under linux
|
# define inUnix when running under Unix (Linux,FreeBSD)
|
||||||
# define inWinNT when running under WinNT
|
# define inWinNT when running under WinNT
|
||||||
#####################################################################
|
#####################################################################
|
||||||
|
|
||||||
@ -22,22 +22,18 @@ nopwd:
|
|||||||
@echo Get ftp://ftp.freepascal.org/pub/fpc/dist/go32v2/utilgo32.zip
|
@echo Get ftp://ftp.freepascal.org/pub/fpc/dist/go32v2/utilgo32.zip
|
||||||
@exit
|
@exit
|
||||||
else
|
else
|
||||||
inlinux=1
|
inUnix=1
|
||||||
endif
|
endif
|
||||||
else
|
else
|
||||||
PWD:=$(firstword $(PWD))
|
PWD:=$(firstword $(PWD))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Detect NT - NT sets OS to Windows_NT
|
# Detect NT - NT sets OS to Windows_NT
|
||||||
ifndef inlinux
|
# Detect OS/2 - OS/2 has OS2_SHELL defined
|
||||||
|
ifndef inUnix
|
||||||
ifeq ($(OS),Windows_NT)
|
ifeq ($(OS),Windows_NT)
|
||||||
inWinNT=1
|
inWinNT=1
|
||||||
endif
|
else
|
||||||
endif
|
|
||||||
|
|
||||||
# Detect OS/2 - OS/2 has OS2_SHELL defined
|
|
||||||
ifndef inlinux
|
|
||||||
ifndef inWinNT
|
|
||||||
ifdef OS2_SHELL
|
ifdef OS2_SHELL
|
||||||
inOS2=1
|
inOS2=1
|
||||||
endif
|
endif
|
||||||
@ -45,14 +41,14 @@ endif
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
# The extension of executables
|
# The extension of executables
|
||||||
ifdef inlinux
|
ifdef inUnix
|
||||||
EXEEXT=
|
SRCEXEEXT=
|
||||||
else
|
else
|
||||||
EXEEXT=.exe
|
SRCEXEEXT=.exe
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# The path which is searched separated by spaces
|
# The path which is searched separated by spaces
|
||||||
ifdef inlinux
|
ifdef inUnix
|
||||||
SEARCHPATH=$(subst :, ,$(PATH))
|
SEARCHPATH=$(subst :, ,$(PATH))
|
||||||
else
|
else
|
||||||
SEARCHPATH=$(subst ;, ,$(PATH))
|
SEARCHPATH=$(subst ;, ,$(PATH))
|
||||||
@ -89,8 +85,8 @@ FPC=ppc386
|
|||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
override FPC:=$(subst $(EXEEXT),,$(FPC))
|
override FPC:=$(subst $(SRCEXEEXT),,$(FPC))
|
||||||
override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
|
override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT)
|
||||||
|
|
||||||
# Target OS
|
# Target OS
|
||||||
ifndef OS_TARGET
|
ifndef OS_TARGET
|
||||||
@ -140,7 +136,7 @@ endif
|
|||||||
[fpcdirdetect]
|
[fpcdirdetect]
|
||||||
# Detect FPCDIR
|
# Detect FPCDIR
|
||||||
ifeq ($(FPCDIR),wrong)
|
ifeq ($(FPCDIR),wrong)
|
||||||
ifdef inlinux
|
ifdef inUnix
|
||||||
override FPCDIR=/usr/local/lib/fpc/$(FPC_VERSION)
|
override FPCDIR=/usr/local/lib/fpc/$(FPC_VERSION)
|
||||||
ifeq ($(wildcard $(FPCDIR)/units),)
|
ifeq ($(wildcard $(FPCDIR)/units),)
|
||||||
override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
|
override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
|
||||||
@ -210,7 +206,7 @@ endif
|
|||||||
ifndef ECHO
|
ifndef ECHO
|
||||||
ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
|
ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
|
||||||
ifeq ($(ECHO),)
|
ifeq ($(ECHO),)
|
||||||
ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
|
ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
|
||||||
ifeq ($(ECHO),)
|
ifeq ($(ECHO),)
|
||||||
ECHO:=echo
|
ECHO:=echo
|
||||||
ECHOE:=echo
|
ECHOE:=echo
|
||||||
@ -251,7 +247,7 @@ endif
|
|||||||
|
|
||||||
# To install files
|
# To install files
|
||||||
ifndef INSTALL
|
ifndef INSTALL
|
||||||
ifdef inlinux
|
ifdef inUnix
|
||||||
INSTALL:=install -m 644
|
INSTALL:=install -m 644
|
||||||
else
|
else
|
||||||
INSTALL:=$(COPY)
|
INSTALL:=$(COPY)
|
||||||
@ -260,7 +256,7 @@ endif
|
|||||||
|
|
||||||
# To install programs
|
# To install programs
|
||||||
ifndef INSTALLEXE
|
ifndef INSTALLEXE
|
||||||
ifdef inlinux
|
ifdef inUnix
|
||||||
INSTALLEXE:=install -m 755
|
INSTALLEXE:=install -m 755
|
||||||
else
|
else
|
||||||
INSTALLEXE:=$(COPY)
|
INSTALLEXE:=$(COPY)
|
||||||
@ -269,7 +265,7 @@ endif
|
|||||||
|
|
||||||
# To make a directory.
|
# To make a directory.
|
||||||
ifndef MKDIR
|
ifndef MKDIR
|
||||||
ifdef inlinux
|
ifdef inUnix
|
||||||
MKDIR:=install -m 755 -d
|
MKDIR:=install -m 755 -d
|
||||||
else
|
else
|
||||||
MKDIR:=ginstall -m 755 -d
|
MKDIR:=ginstall -m 755 -d
|
||||||
@ -295,7 +291,7 @@ LD=ld
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
# ppas.bat / ppas.sh
|
# ppas.bat / ppas.sh
|
||||||
ifdef inlinux
|
ifdef inUnix
|
||||||
PPAS=ppas.sh
|
PPAS=ppas.sh
|
||||||
else
|
else
|
||||||
ifdef inOS2
|
ifdef inOS2
|
||||||
@ -306,7 +302,7 @@ endif
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
# ldconfig to rebuild .so cache
|
# ldconfig to rebuild .so cache
|
||||||
ifdef inlinux
|
ifdef inUnix
|
||||||
LDCONFIG=ldconfig
|
LDCONFIG=ldconfig
|
||||||
else
|
else
|
||||||
LDCONFIG=
|
LDCONFIG=
|
||||||
@ -315,7 +311,7 @@ endif
|
|||||||
[tool_ppdep]
|
[tool_ppdep]
|
||||||
# ppdep
|
# ppdep
|
||||||
ifndef PPDEP
|
ifndef PPDEP
|
||||||
PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
|
PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(SRCEXEEXT),$(SEARCHPATH))))
|
||||||
ifeq ($(PPDEP),)
|
ifeq ($(PPDEP),)
|
||||||
PPDEP=
|
PPDEP=
|
||||||
else
|
else
|
||||||
@ -327,7 +323,7 @@ export PPDEP
|
|||||||
[tool_ppumove]
|
[tool_ppumove]
|
||||||
# ppumove
|
# ppumove
|
||||||
ifndef PPUMOVE
|
ifndef PPUMOVE
|
||||||
PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
|
PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
|
||||||
ifeq ($(PPUMOVE),)
|
ifeq ($(PPUMOVE),)
|
||||||
PPUMOVE=
|
PPUMOVE=
|
||||||
else
|
else
|
||||||
@ -339,7 +335,7 @@ export PPUMOVE
|
|||||||
[tool_ppufiles]
|
[tool_ppufiles]
|
||||||
# ppufiles
|
# ppufiles
|
||||||
ifndef PPUFILES
|
ifndef PPUFILES
|
||||||
PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
|
PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(SRCEXEEXT),$(SEARCHPATH))))
|
||||||
ifeq ($(PPUFILES),)
|
ifeq ($(PPUFILES),)
|
||||||
PPUFILES=
|
PPUFILES=
|
||||||
else
|
else
|
||||||
@ -351,7 +347,7 @@ export PPUFILES
|
|||||||
[tool_data2inc]
|
[tool_data2inc]
|
||||||
# data2inc
|
# data2inc
|
||||||
ifndef DATA2INC
|
ifndef DATA2INC
|
||||||
DATA2INC:=$(strip $(wildcard $(addsuffix /data2inc$(EXEEXT),$(SEARCHPATH))))
|
DATA2INC:=$(strip $(wildcard $(addsuffix /data2inc$(SRCEXEEXT),$(SEARCHPATH))))
|
||||||
ifeq ($(DATA2INC),)
|
ifeq ($(DATA2INC),)
|
||||||
DATA2INC=
|
DATA2INC=
|
||||||
else
|
else
|
||||||
@ -363,7 +359,7 @@ export DATA2INC
|
|||||||
[tool_diff]
|
[tool_diff]
|
||||||
# diff
|
# diff
|
||||||
ifndef DIFF
|
ifndef DIFF
|
||||||
DIFF:=$(strip $(wildcard $(addsuffix /diff$(EXEEXT),$(SEARCHPATH))))
|
DIFF:=$(strip $(wildcard $(addsuffix /diff$(SRCEXEEXT),$(SEARCHPATH))))
|
||||||
ifeq ($(DIFF),)
|
ifeq ($(DIFF),)
|
||||||
DIFF=
|
DIFF=
|
||||||
else
|
else
|
||||||
@ -375,7 +371,7 @@ export DIFF
|
|||||||
[tool_cmp]
|
[tool_cmp]
|
||||||
# cmp
|
# cmp
|
||||||
ifndef CMP
|
ifndef CMP
|
||||||
CMP:=$(strip $(wildcard $(addsuffix /cmp$(EXEEXT),$(SEARCHPATH))))
|
CMP:=$(strip $(wildcard $(addsuffix /cmp$(SRCEXEEXT),$(SEARCHPATH))))
|
||||||
ifeq ($(CMP),)
|
ifeq ($(CMP),)
|
||||||
CMP=
|
CMP=
|
||||||
else
|
else
|
||||||
@ -387,7 +383,7 @@ export CMP
|
|||||||
[tool_sed]
|
[tool_sed]
|
||||||
# Sed
|
# Sed
|
||||||
ifndef SED
|
ifndef SED
|
||||||
SED:=$(strip $(wildcard $(addsuffix /sed$(EXEEXT),$(SEARCHPATH))))
|
SED:=$(strip $(wildcard $(addsuffix /sed$(SRCEXEEXT),$(SEARCHPATH))))
|
||||||
ifeq ($(SED),)
|
ifeq ($(SED),)
|
||||||
SED=
|
SED=
|
||||||
else
|
else
|
||||||
@ -407,7 +403,7 @@ ifeq ($(OS_TARGET),win32)
|
|||||||
UPXPROG:=1
|
UPXPROG:=1
|
||||||
endif
|
endif
|
||||||
ifdef UPXPROG
|
ifdef UPXPROG
|
||||||
UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
|
UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH))))
|
||||||
ifeq ($(UPXPROG),)
|
ifeq ($(UPXPROG),)
|
||||||
UPXPROG=
|
UPXPROG=
|
||||||
else
|
else
|
||||||
@ -422,9 +418,9 @@ export UPXPROG
|
|||||||
[tool_date]
|
[tool_date]
|
||||||
# gdate/date
|
# gdate/date
|
||||||
ifndef DATE
|
ifndef DATE
|
||||||
DATE:=$(strip $(wildcard $(addsuffix /date$(EXEEXT),$(SEARCHPATH))))
|
DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
|
||||||
ifeq ($(DATE),)
|
ifeq ($(DATE),)
|
||||||
DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
|
DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
|
||||||
ifeq ($(DATE),)
|
ifeq ($(DATE),)
|
||||||
DATE=
|
DATE=
|
||||||
else
|
else
|
||||||
@ -445,7 +441,7 @@ endif
|
|||||||
[tool_zip]
|
[tool_zip]
|
||||||
# ZipProg, you can't use Zip as the var name (PFV)
|
# ZipProg, you can't use Zip as the var name (PFV)
|
||||||
ifndef ZIPPROG
|
ifndef ZIPPROG
|
||||||
ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
|
ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(SRCEXEEXT),$(SEARCHPATH))))
|
||||||
ifeq ($(ZIPPROG),)
|
ifeq ($(ZIPPROG),)
|
||||||
ZIPPROG=
|
ZIPPROG=
|
||||||
else
|
else
|
||||||
@ -460,7 +456,7 @@ ZIPEXT=.zip
|
|||||||
[tool_tar]
|
[tool_tar]
|
||||||
# Tar
|
# Tar
|
||||||
ifndef TARPROG
|
ifndef TARPROG
|
||||||
TARPROG:=$(strip $(wildcard $(addsuffix /tar$(EXEEXT),$(SEARCHPATH))))
|
TARPROG:=$(strip $(wildcard $(addsuffix /tar$(SRCEXEEXT),$(SEARCHPATH))))
|
||||||
ifeq ($(TARPROG),)
|
ifeq ($(TARPROG),)
|
||||||
TARPROG=
|
TARPROG=
|
||||||
else
|
else
|
||||||
@ -485,6 +481,7 @@ endif
|
|||||||
|
|
||||||
# Default needed extensions (Go32v2,Linux)
|
# Default needed extensions (Go32v2,Linux)
|
||||||
LOADEREXT=.as
|
LOADEREXT=.as
|
||||||
|
EXEEXT=.exe
|
||||||
PPLEXT=.ppl
|
PPLEXT=.ppl
|
||||||
PPUEXT=.ppu
|
PPUEXT=.ppu
|
||||||
OEXT=.o
|
OEXT=.o
|
||||||
@ -513,9 +510,18 @@ endif
|
|||||||
|
|
||||||
# Linux
|
# Linux
|
||||||
ifeq ($(OS_TARGET),linux)
|
ifeq ($(OS_TARGET),linux)
|
||||||
|
EXEEXT=
|
||||||
|
HASSHAREDLIB=1
|
||||||
FPCMADE=fpcmade.lnx
|
FPCMADE=fpcmade.lnx
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
# Linux
|
||||||
|
ifeq ($(OS_TARGET),freebsd)
|
||||||
|
EXEEXT=
|
||||||
|
HASSHAREDLIB=1
|
||||||
|
FPCMADE=fpcmade.freebsd
|
||||||
|
endif
|
||||||
|
|
||||||
# Win32
|
# Win32
|
||||||
ifeq ($(OS_TARGET),win32)
|
ifeq ($(OS_TARGET),win32)
|
||||||
PPUEXT=.ppw
|
PPUEXT=.ppw
|
||||||
@ -567,9 +573,17 @@ endif
|
|||||||
# Default Directories
|
# Default Directories
|
||||||
#####################################################################
|
#####################################################################
|
||||||
|
|
||||||
|
# Linux and freebsd use unix dirs with /usr/bin, /usr/lib
|
||||||
|
ifeq ($(OS_TARGET),linux)
|
||||||
|
UNIXINSTALLDIR=1
|
||||||
|
endif
|
||||||
|
ifeq ($(OS_TARGET),freebsd)
|
||||||
|
UNIXINSTALLDIR=1
|
||||||
|
endif
|
||||||
|
|
||||||
# set the prefix directory where to install everything
|
# set the prefix directory where to install everything
|
||||||
ifndef PREFIXINSTALLDIR
|
ifndef PREFIXINSTALLDIR
|
||||||
ifdef inlinux
|
ifdef UNIXINSTALLDIR
|
||||||
PREFIXINSTALLDIR=/usr
|
PREFIXINSTALLDIR=/usr
|
||||||
else
|
else
|
||||||
PREFIXINSTALLDIR=/pp
|
PREFIXINSTALLDIR=/pp
|
||||||
@ -591,7 +605,7 @@ export DESTZIPDIR
|
|||||||
|
|
||||||
# set the base directory where to install everything
|
# set the base directory where to install everything
|
||||||
ifndef BASEINSTALLDIR
|
ifndef BASEINSTALLDIR
|
||||||
ifdef inlinux
|
ifdef UNIXINSTALLDIR
|
||||||
BASEINSTALLDIR=$(PREFIXINSTALLDIR)/lib/fpc/$(FPC_VERSION)
|
BASEINSTALLDIR=$(PREFIXINSTALLDIR)/lib/fpc/$(FPC_VERSION)
|
||||||
else
|
else
|
||||||
BASEINSTALLDIR=$(PREFIXINSTALLDIR)
|
BASEINSTALLDIR=$(PREFIXINSTALLDIR)
|
||||||
@ -600,7 +614,7 @@ endif
|
|||||||
|
|
||||||
# set the directory where to install the binaries
|
# set the directory where to install the binaries
|
||||||
ifndef BININSTALLDIR
|
ifndef BININSTALLDIR
|
||||||
ifdef inlinux
|
ifdef UNIXINSTALLDIR
|
||||||
BININSTALLDIR=$(PREFIXINSTALLDIR)/bin
|
BININSTALLDIR=$(PREFIXINSTALLDIR)/bin
|
||||||
else
|
else
|
||||||
BININSTALLDIR=$(BASEINSTALLDIR)/bin/$(OS_TARGET)
|
BININSTALLDIR=$(BASEINSTALLDIR)/bin/$(OS_TARGET)
|
||||||
@ -617,7 +631,7 @@ endif
|
|||||||
|
|
||||||
# Where to install shared libraries
|
# Where to install shared libraries
|
||||||
ifndef LIBINSTALLDIR
|
ifndef LIBINSTALLDIR
|
||||||
ifdef inlinux
|
ifdef UNIXINSTALLDIR
|
||||||
LIBINSTALLDIR=$(PREFIXINSTALLDIR)/lib
|
LIBINSTALLDIR=$(PREFIXINSTALLDIR)/lib
|
||||||
else
|
else
|
||||||
LIBINSTALLDIR=$(UNITINSTALLDIR)
|
LIBINSTALLDIR=$(UNITINSTALLDIR)
|
||||||
@ -626,7 +640,7 @@ endif
|
|||||||
|
|
||||||
# Where the source files will be stored
|
# Where the source files will be stored
|
||||||
ifndef SOURCEINSTALLDIR
|
ifndef SOURCEINSTALLDIR
|
||||||
ifdef inlinux
|
ifdef UNIXINSTALLDIR
|
||||||
SOURCEINSTALLDIR=$(PREFIXINSTALLDIR)/src/fpc-$(FPC_VERSION)
|
SOURCEINSTALLDIR=$(PREFIXINSTALLDIR)/src/fpc-$(FPC_VERSION)
|
||||||
else
|
else
|
||||||
SOURCEINSTALLDIR=$(BASEINSTALLDIR)/source
|
SOURCEINSTALLDIR=$(BASEINSTALLDIR)/source
|
||||||
@ -638,7 +652,7 @@ endif
|
|||||||
|
|
||||||
# Where the doc files will be stored
|
# Where the doc files will be stored
|
||||||
ifndef DOCINSTALLDIR
|
ifndef DOCINSTALLDIR
|
||||||
ifdef inlinux
|
ifdef UNIXINSTALLDIR
|
||||||
DOCINSTALLDIR=$(PREFIXINSTALLDIR)/doc/fpc-$(FPC_VERSION)
|
DOCINSTALLDIR=$(PREFIXINSTALLDIR)/doc/fpc-$(FPC_VERSION)
|
||||||
else
|
else
|
||||||
DOCINSTALLDIR=$(BASEINSTALLDIR)/doc
|
DOCINSTALLDIR=$(BASEINSTALLDIR)/doc
|
||||||
@ -648,7 +662,7 @@ endif
|
|||||||
# Where to install the examples, under linux we use the doc dir
|
# Where to install the examples, under linux we use the doc dir
|
||||||
# because the copytree command will create a subdir itself
|
# because the copytree command will create a subdir itself
|
||||||
ifndef EXAMPLEINSTALLDIR
|
ifndef EXAMPLEINSTALLDIR
|
||||||
ifdef inlinux
|
ifdef UNIXINSTALLDIR
|
||||||
EXAMPLEINSTALLDIR=$(DOCINSTALLDIR)/examples
|
EXAMPLEINSTALLDIR=$(DOCINSTALLDIR)/examples
|
||||||
else
|
else
|
||||||
EXAMPLEINSTALLDIR=$(BASEINSTALLDIR)/examples
|
EXAMPLEINSTALLDIR=$(BASEINSTALLDIR)/examples
|
||||||
@ -666,7 +680,7 @@ endif
|
|||||||
|
|
||||||
[dir_gcclib]
|
[dir_gcclib]
|
||||||
# On linux, try to find where libgcc.a is.
|
# On linux, try to find where libgcc.a is.
|
||||||
ifdef inlinux
|
ifdef inUnix
|
||||||
ifndef GCCLIBDIR
|
ifndef GCCLIBDIR
|
||||||
GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`)
|
GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`)
|
||||||
endif
|
endif
|
||||||
@ -676,7 +690,7 @@ export GCCLIBDIR
|
|||||||
|
|
||||||
[dir_otherlib]
|
[dir_otherlib]
|
||||||
# Where to find other libraries
|
# Where to find other libraries
|
||||||
ifdef inlinux
|
ifdef inUnix
|
||||||
ifndef OTHERLIBDIR
|
ifndef OTHERLIBDIR
|
||||||
OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }')
|
OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }')
|
||||||
endif
|
endif
|
||||||
@ -694,7 +708,7 @@ REDIRFILE=log
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef REDIR
|
ifdef REDIR
|
||||||
ifndef inlinux
|
ifndef inUnix
|
||||||
override FPC=redir -eo $(FPC)
|
override FPC=redir -eo $(FPC)
|
||||||
endif
|
endif
|
||||||
# set the verbosity to max
|
# set the verbosity to max
|
||||||
@ -1071,7 +1085,7 @@ fpc_smart:
|
|||||||
$(MAKE) all LINKSMART=1 CREATESMART=1
|
$(MAKE) all LINKSMART=1 CREATESMART=1
|
||||||
|
|
||||||
fpc_shared: all
|
fpc_shared: all
|
||||||
ifdef inlinux
|
ifdef HASSHAREDLIB
|
||||||
ifndef LIBNAME
|
ifndef LIBNAME
|
||||||
@$(ECHO) "LIBNAME not set"
|
@$(ECHO) "LIBNAME not set"
|
||||||
else
|
else
|
||||||
@ -1118,7 +1132,7 @@ ifneq ($(INSTALLPPULINKFILES),)
|
|||||||
endif
|
endif
|
||||||
ifneq ($(wildcard $(LIBFULLNAME)),)
|
ifneq ($(wildcard $(LIBFULLNAME)),)
|
||||||
@$(ECHO) $(LIBINSTALLDIR)/$(LIBFULLNAME)
|
@$(ECHO) $(LIBINSTALLDIR)/$(LIBFULLNAME)
|
||||||
ifdef inlinux
|
ifdef HASSHAREDLIB
|
||||||
@$(ECHO) $(LIBINSTALLDIR)/$(LIBNAME)
|
@$(ECHO) $(LIBINSTALLDIR)/$(LIBNAME)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
@ -1146,7 +1160,7 @@ endif
|
|||||||
ifneq ($(wildcard $(LIBFULLNAME)),)
|
ifneq ($(wildcard $(LIBFULLNAME)),)
|
||||||
$(MKDIR) $(LIBINSTALLDIR)
|
$(MKDIR) $(LIBINSTALLDIR)
|
||||||
$(INSTALL) $(LIBFULLNAME) $(LIBINSTALLDIR)
|
$(INSTALL) $(LIBFULLNAME) $(LIBINSTALLDIR)
|
||||||
ifdef inlinux
|
ifdef inUnix
|
||||||
ln -sf $(LIBFULLNAME) $(LIBINSTALLDIR)/$(LIBNAME)
|
ln -sf $(LIBFULLNAME) $(LIBINSTALLDIR)/$(LIBNAME)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
@ -1212,7 +1226,7 @@ endif
|
|||||||
|
|
||||||
# Temporary path to pack a file
|
# Temporary path to pack a file
|
||||||
ifndef PACKDIR
|
ifndef PACKDIR
|
||||||
ifndef inlinux
|
ifndef inUnix
|
||||||
PACKDIR=$(BASEDIR)/pack_tmp
|
PACKDIR=$(BASEDIR)/pack_tmp
|
||||||
else
|
else
|
||||||
PACKDIR=/tmp/fpc-pack
|
PACKDIR=/tmp/fpc-pack
|
||||||
@ -1228,7 +1242,7 @@ endif
|
|||||||
|
|
||||||
# Use tar by default under linux
|
# Use tar by default under linux
|
||||||
ifndef USEZIP
|
ifndef USEZIP
|
||||||
ifdef inlinux
|
ifdef inUnix
|
||||||
USETAR=1
|
USETAR=1
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
@ -1359,7 +1373,6 @@ fpc_infocfg:
|
|||||||
|
|
||||||
[info_dirs]
|
[info_dirs]
|
||||||
fpc_infodirs:
|
fpc_infodirs:
|
||||||
ifdef inlinux
|
|
||||||
@$(ECHO)
|
@$(ECHO)
|
||||||
@$(ECHO) == Directory info ==
|
@$(ECHO) == Directory info ==
|
||||||
@$(ECHO)
|
@$(ECHO)
|
||||||
@ -1374,7 +1387,6 @@ endif
|
|||||||
@$(ECHO) GCC library..... $(GCCLIBDIR)
|
@$(ECHO) GCC library..... $(GCCLIBDIR)
|
||||||
@$(ECHO) Other library... $(OTHERLIBDIR)
|
@$(ECHO) Other library... $(OTHERLIBDIR)
|
||||||
@$(ECHO)
|
@$(ECHO)
|
||||||
endif
|
|
||||||
|
|
||||||
[info_tools]
|
[info_tools]
|
||||||
fpc_infotools:
|
fpc_infotools:
|
||||||
|
Loading…
Reference in New Issue
Block a user