|
@@ -19,9 +19,9 @@ override PATH:=$(subst \,/,$(PATH))
|
|
|
# that normally doesn't exists in path names.
|
|
|
ifeq ($(findstring ;,$(PATH)),)
|
|
|
inUnix=1
|
|
|
-SEARCHPATH=$(subst :, ,$(PATH))
|
|
|
+SEARCHPATH:=$(subst :, ,$(PATH))
|
|
|
else
|
|
|
-SEARCHPATH=$(subst ;, ,$(PATH))
|
|
|
+SEARCHPATH:=$(subst ;, ,$(PATH))
|
|
|
endif
|
|
|
|
|
|
# Search for PWD and determine also if we are under linux
|
|
@@ -74,7 +74,7 @@ endif
|
|
|
ifdef inUnix
|
|
|
PATHSEP=/
|
|
|
else
|
|
|
-PATHSEP=$(subst /,\,/)
|
|
|
+PATHSEP:=$(subst /,\,/)
|
|
|
endif
|
|
|
|
|
|
# Base dir
|
|
@@ -166,10 +166,10 @@ endif
|
|
|
endif
|
|
|
|
|
|
# Units dir
|
|
|
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
|
|
|
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
|
|
|
|
|
|
# Packages dir
|
|
|
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
|
|
|
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
|
|
|
|
|
|
|
|
|
[shelltools]
|
|
@@ -737,7 +737,12 @@ override FPCOPT+=@$(CFGFILE)
|
|
|
endif
|
|
|
|
|
|
# For win32 the options are passed using the environment FPCEXTCMD
|
|
|
+# to prevent to long commandlines
|
|
|
ifeq ($(OS_SOURCE),win32)
|
|
|
+USEENV=1
|
|
|
+endif
|
|
|
+
|
|
|
+ifdef USEENV
|
|
|
override FPCEXTCMD:=$(FPCOPT)
|
|
|
override FPCOPT:=!FPCEXTCMD
|
|
|
export FPCEXTCMD
|
|
@@ -999,7 +1004,7 @@ fpc_sourceinstall: distclean
|
|
|
fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
|
|
|
ifdef HASEXAMPLES
|
|
|
$(MKDIR) $(INSTALL_EXAMPLEDIR)
|
|
|
-endif
|
|
|
+endif
|
|
|
ifdef EXAMPLESOURCEFILES
|
|
|
$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
|
|
|
endif
|