|
|
@@ -5,7 +5,7 @@ default: all
|
|
|
override PATH:=$(subst \,/,$(PATH))
|
|
|
ifeq ($(findstring ;,$(PATH)),)
|
|
|
inUnix=1
|
|
|
-SEARCHPATH:=$(subst .,,$(subst :, ,$(PATH)))
|
|
|
+SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH)))
|
|
|
else
|
|
|
SEARCHPATH:=$(subst ;, ,$(PATH))
|
|
|
endif
|
|
|
@@ -227,15 +227,6 @@ ifndef MKDIR
|
|
|
MKDIR:=$(GINSTALL) -m 755 -d
|
|
|
endif
|
|
|
export ECHOREDIR COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
|
|
|
-ifndef PPUFILES
|
|
|
-PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(SRCEXEEXT),$(SEARCHPATH))))
|
|
|
-ifeq ($(PPUFILES),)
|
|
|
-PPUFILES=
|
|
|
-else
|
|
|
-PPUFILES:=$(firstword $(PPUFILES))
|
|
|
-endif
|
|
|
-endif
|
|
|
-export PPUFILES
|
|
|
ifndef PPUMOVE
|
|
|
PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
|
|
|
ifeq ($(PPUMOVE),)
|
|
|
@@ -329,7 +320,7 @@ ASMEXT=.s
|
|
|
SMARTEXT=.sl
|
|
|
STATICLIBEXT=.a
|
|
|
SHAREDLIBEXT=.so
|
|
|
-LIBPREFIX=lib
|
|
|
+STATICLIBPREFIX=libp
|
|
|
RSTEXT=.rst
|
|
|
FPCMADE=fpcmade
|
|
|
ifeq ($(OS_TARGET),go32v1)
|
|
|
@@ -339,12 +330,12 @@ ASMEXT=.s1
|
|
|
SMARTEXT=.sl1
|
|
|
STATICLIBEXT=.a1
|
|
|
SHAREDLIBEXT=.so1
|
|
|
-LIBPREFIX=
|
|
|
+STATICLIBPREFIX=
|
|
|
FPCMADE=fpcmade.v1
|
|
|
PACKAGESUFFIX=v1
|
|
|
endif
|
|
|
ifeq ($(OS_TARGET),go32v2)
|
|
|
-LIBPREFIX=
|
|
|
+STATICLIBPREFIX=
|
|
|
FPCMADE=fpcmade.dos
|
|
|
ZIPSUFFIX=go32
|
|
|
endif
|
|
|
@@ -442,9 +433,11 @@ endif
|
|
|
ifndef INSTALL_UNITDIR
|
|
|
INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
|
|
|
ifdef INSTALL_FPCPACKAGE
|
|
|
+ifdef PACKAGE_NAME
|
|
|
INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
|
|
|
endif
|
|
|
endif
|
|
|
+endif
|
|
|
ifndef INSTALL_LIBDIR
|
|
|
ifdef UNIXINSTALLDIR
|
|
|
INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
|
|
|
@@ -687,13 +680,9 @@ ifdef CLEAN_UNITS
|
|
|
override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))
|
|
|
endif
|
|
|
ifdef CLEANPPUFILES
|
|
|
+override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))
|
|
|
override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILES))
|
|
|
-ifdef PPUFILES
|
|
|
-CLEANPPULINKFILES:=$(shell $(PPUFILES) $(CLEANPPUFILES))
|
|
|
-else
|
|
|
-CLEANPPULINKFILES:=$(wildcard $(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(addprefix $(LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))))
|
|
|
-endif
|
|
|
-override CLEANPPULINKFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILES))
|
|
|
+override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILES)))
|
|
|
endif
|
|
|
fpc_clean: $(CLEANTARGET)
|
|
|
ifdef CLEANEXEFILES
|
|
|
@@ -766,7 +755,6 @@ fpc_info:
|
|
|
@$(ECHO) Date...... $(DATE)
|
|
|
@$(ECHO) FPCMake... $(FPCMAKE)
|
|
|
@$(ECHO) PPUMove... $(PPUMOVE)
|
|
|
- @$(ECHO) PPUFiles.. $(PPUFILES)
|
|
|
@$(ECHO) Upx....... $(UPXPROG)
|
|
|
@$(ECHO) Zip....... $(ZIPPROG)
|
|
|
@$(ECHO)
|
peter