* regenerated

Makefile.fpc

@@ -91,7 +91,7 @@ PPNEW=$(BASEDIR)/compiler/ppc386$(EXEEXT)
 
 # Don't use ppufiles for win32 becuase of commandline length problems
 ifneq ($(OS_TARGET),win32)
-PPUFILESNEW=$(BASEDIR)/utils/ppufiles$(EXEEXT)
+PPUFILESNEW=$(BASEDIR)/compiler/utils/ppufiles$(EXEEXT)
 endif
 
 # Build/install options
@@ -151,14 +151,11 @@ help:
 # Compiler
 #######################################
 
-.PHONY: compiler_cycle compiler_fpcexe
+.PHONY: compiler_cycle
 
 compiler_cycle:
         $(MAKE) -C compiler cycle
 
-compiler_fpcexe:
-        $(MAKE) -C compiler fpcexe
-
 
 #######################################
 # IDE
@@ -171,7 +168,8 @@ ide_comp:
         $(MAKE) -C ide full
 
 # Look if libgdb.a is available then use fullgdb
-ifneq ($(wildcard packages/gdbint/libgdb/$(OS_TARGET)/libgdb.a),)
+LIBGDB:=$(strip $(wildcard packages/gdbint/libgdb/$(OS_TARGET)/libgdb.a))
+ifneq ($(LIBGDB),)
 ide_full:
         $(MAKE) -C compiler ppuclean
         $(MAKE) -C ide fullgdb
@@ -269,8 +267,8 @@ else
 endif
 # clean
         $(MAKE) rtl_clean
-        $(MAKE) fcl_clean
         $(MAKE) packages_clean
+        $(MAKE) fcl_clean
         $(MAKE) utils_clean
 ifdef IDE
         $(MAKE) fv_clean
@@ -278,10 +276,9 @@ ifdef IDE
 endif
 # build everything
         $(MAKE) rtl_$(ALLTARGET) $(BUILDOPTS)
-        $(MAKE) fcl_$(ALLTARGET) $(BUILDOPTS)
         $(MAKE) packages_$(ALLTARGET) $(BUILDOPTS)
+        $(MAKE) fcl_$(ALLTARGET) $(BUILDOPTS)
         $(MAKE) utils_all $(BUILDOPTS)
-        $(MAKE) compiler_fpcexe $(BUILDOPTS)
 ifdef IDE
         $(MAKE) ide_full $(BUILDOPTS)
 endif
@@ -317,18 +314,18 @@ endif
 
 install: build-stamp.$(OS_TARGET)
         $(MAKE) installbase $(INSTALLOPTS)
-        $(MAKE) utils_$(INSTALLTARGET) $(INSTALLOPTS)
-        $(MAKE) fcl_$(INSTALLTARGET) $(INSTALLOPTS)
         $(MAKE) packages_$(INSTALLTARGET) $(INSTALLOPTS)
+        $(MAKE) fcl_$(INSTALLTARGET) $(INSTALLOPTS)
+        $(MAKE) utils_$(INSTALLTARGET) $(INSTALLOPTS)
 ifdef IDE
         $(NOSTOP)$(MAKE) ide_$(INSTALLTARGET) $(BUILDOPTS)
 endif
 
 zipinstall: build-stamp.$(OS_TARGET)
         $(MAKE) fpc_zipinstall ZIPTARGET=installbase ZIPNAME=base$(ZIPSUFFIX) $(INSTALLOPTS)
-        $(MAKE) utils_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPNAME=util$(ZIPSUFFIX)
-        $(MAKE) fcl_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPPREFIX=$(PKGPRE)
         $(MAKE) packages_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPPREFIX=$(PKGPRE)
+        $(MAKE) fcl_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPPREFIX=$(PKGPRE)
+        $(MAKE) utils_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPNAME=util$(ZIPSUFFIX)
 ifdef IDE
         $(NOSTOP)$(MAKE) ide_zip$(INSTALLTARGET) $(INSTALLOPTS)
 endif
@@ -384,8 +381,8 @@ sourcezip: distclean
         $(MAKE) fpc_zipinstall ZIPTARGET=sourcebase ZIPNAME=basesrc
         $(MAKE) compiler_zipsourceinstall
         $(MAKE) rtl_zipsourceinstall
-        $(MAKE) fcl_zipsourceinstall
         $(MAKE) packages_zipsourceinstall
+        $(MAKE) fcl_zipsourceinstall
         $(MAKE) utils_zipsourceinstall
         $(MAKE) ide_zipsourceinstall
 #        $(MAKE) installersrc

fcl/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/11]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=fcl
 override PACKAGE_VERSION=1.0.5
 override TARGET_DIRS+=xml db shedit
@@ -702,6 +702,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -815,7 +818,7 @@ fpc_sourceinstall: distclean
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif	
+endif
 ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif

fcl/db/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/11]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=fcl
 override TARGET_DIRS+=dbase
 ifeq ($(OS_TARGET),linux)
@@ -629,6 +629,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -738,7 +741,7 @@ fpc_sourceinstall: distclean
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif	
+endif
 ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif

fcl/db/dbase/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/11]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=fcl
 override TARGET_UNITS+=dbf
 override TARGET_EXAMPLES+=testdbf
@@ -549,6 +549,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -658,7 +661,7 @@ fpc_sourceinstall: distclean
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif	
+endif
 ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif

fcl/db/interbase/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/11]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=fcl
 override TARGET_UNITS+=interbase
 override TARGET_EXAMPLES+=testib
@@ -596,6 +596,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -705,7 +708,7 @@ fpc_sourceinstall: distclean
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif	
+endif
 ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif

fcl/db/mysql/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/11]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=fcl
 override TARGET_UNITS+=mysqldb
 override TARGET_EXAMPLES+=testm
@@ -596,6 +596,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -705,7 +708,7 @@ fpc_sourceinstall: distclean
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif	
+endif
 ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif

fcl/db/tests/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/11]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override TARGET_PROGRAMS+=testds createds tested
 override COMPILER_OPTIONS+=-S2
 ifndef ECHO
@@ -711,6 +711,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -809,7 +812,7 @@ fpc_sourceinstall: distclean
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif	
+endif
 ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif

fcl/shedit/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/11]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=fcl
 override TARGET_UNITS+=doc_text shedit sh_xml sh_pas
 override COMPILER_OPTIONS+=-S2
@@ -548,6 +548,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -642,7 +645,7 @@ fpc_sourceinstall: distclean
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif	
+endif
 ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif

fcl/shedit/gtk/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/11]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -107,8 +107,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override TARGET_PROGRAMS+=gtkdemo
 override TARGET_UNITS+=gtkshedit
 ifndef ECHO
@@ -795,6 +795,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -901,7 +904,7 @@ fpc_sourceinstall: distclean
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif	
+endif
 ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif

fcl/tests/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/11]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override TARGET_PROGRAMS+=stringl dparser fstream mstream list threads testrtf cfgtest xmldump htdump testcgi tidea b64test b64test2 b64enc b64dec restest testz testz2 istream doecho
 ifeq ($(OS_TARGET),linux)
 override TARGET_PROGRAMS+=sockcli isockcli dsockcli socksvr isocksvr dsocksvr
@@ -717,6 +717,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -815,7 +818,7 @@ fpc_sourceinstall: distclean
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif	
+endif
 ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif

fcl/xml/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/11]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=fcl
 override TARGET_UNITS+=dom htmldoc xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite
 override COMPILER_OPTIONS+=-S2
@@ -548,6 +548,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -642,7 +645,7 @@ fpc_sourceinstall: distclean
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif	
+endif
 ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif

install/demo/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/24]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -107,8 +107,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=demo
 override PACKAGE_VERSION=1.0.5
 override TARGET_DIRS+=text graph
@@ -180,6 +180,9 @@ endif
 ifndef LD
 LD=ld
 endif
+ifndef RC
+RC=rc
+endif
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -505,6 +508,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -589,14 +595,13 @@ fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
 	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
-ifdef EXAMPLESOURCEFILES
+ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
+endif
+ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif
 ifdef TARGET_EXAMPLEDIRS
-ifndef EXAMPLESOURCEFILES
-	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
 fpc_distinstall: fpc_install fpc_exampleinstall
@@ -666,7 +671,9 @@ endif
 fpc_zipsourceinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
 fpc_zipexampleinstall:
+ifdef HASEXAMPLES
 	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean

install/demo/graph/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/24]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -91,6 +91,14 @@ else
 override FPCDIR=wrong
 endif
 ifeq ($(FPCDIR),wrong)
+override FPCDIR=../..
+ifeq ($(wildcard $(FPCDIR)/rtl),)
+ifeq ($(wildcard $(FPCDIR)/units),)
+override FPCDIR=wrong
+endif
+endif
+endif
+ifeq ($(FPCDIR),wrong)
 ifdef inUnix
 override FPCDIR=/usr/local/lib/fpc/$(FPC_VERSION)
 ifeq ($(wildcard $(FPCDIR)/units),)
@@ -107,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 ifdef GRAPHICS
 override FPCOPT+=-dUSEGRAPHICS
 endif
@@ -170,6 +178,9 @@ endif
 ifndef LD
 LD=ld
 endif
+ifndef RC
+RC=rc
+endif
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -538,6 +549,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -642,14 +656,13 @@ fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
 	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
-ifdef EXAMPLESOURCEFILES
+ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
+endif
+ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif
 ifdef TARGET_EXAMPLEDIRS
-ifndef EXAMPLESOURCEFILES
-	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
 fpc_distinstall: fpc_install fpc_exampleinstall

install/demo/graph/Makefile.fpc

@@ -6,6 +6,9 @@
 units=gameunit
 programs=fpctris mandel samegame quad maze gravwars
 
+[default]
+fpcdir=../..
+
 [prerules]
 ifdef GRAPHICS
 override FPCOPT+=-dUSEGRAPHICS

install/demo/graph/mandel.pp

@@ -32,7 +32,7 @@ const
 var
   SearchPoint,ActualPoint,NextPoint       : PointType;
   LastColor                              : longint;
-  Gd,Gm,
+  Gd,Gm                                  : smallint;
   Max_Color,Max_X_Width,
   Max_Y_Width,Y_Width                    : word;
   Y1,Y2,X1,X2,Dy,Dx                      : Real;
@@ -254,7 +254,7 @@ end ;
                               MAINROUTINE
 ------------------------------------------------------------------------------}
   var
-     error,dummy : word;
+     error,dummy : smallint;
 
 var i,neededtime,starttime : longint;
   hour, minute, second, sec100 : word;
@@ -284,7 +284,7 @@ begin
 {$endif go32v2}
     end;
   gd:=d8bit;
-  if gm=$ffff then
+  if gm=-1 then
     GetModeRange(gd,dummy,gm);
   GetTime(hour, minute, second, sec100);
   starttime:=((hour*60+minute)*60+second)*100+sec100;
@@ -336,7 +336,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:08  michael
+  Revision 1.3  2001-04-25 22:45:41  peter
+    * regenerated
+
+  Revision 1.2  2000/07/13 11:33:08  michael
   + removed logs
- 
+
 }

install/demo/linux/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/24]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -91,6 +91,14 @@ else
 override FPCDIR=wrong
 endif
 ifeq ($(FPCDIR),wrong)
+override FPCDIR=../..
+ifeq ($(wildcard $(FPCDIR)/rtl),)
+ifeq ($(wildcard $(FPCDIR)/units),)
+override FPCDIR=wrong
+endif
+endif
+endif
+ifeq ($(FPCDIR),wrong)
 ifdef inUnix
 override FPCDIR=/usr/local/lib/fpc/$(FPC_VERSION)
 ifeq ($(wildcard $(FPCDIR)/units),)
@@ -107,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 ifeq ($(OS_TARGET),linux)
 override TARGET_PROGRAMS+=daemon
 endif
@@ -168,6 +176,9 @@ endif
 ifndef LD
 LD=ld
 endif
+ifndef RC
+RC=rc
+endif
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -536,6 +547,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -632,14 +646,13 @@ fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
 	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
-ifdef EXAMPLESOURCEFILES
+ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
+endif
+ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif
 ifdef TARGET_EXAMPLEDIRS
-ifndef EXAMPLESOURCEFILES
-	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
 fpc_distinstall: fpc_install fpc_exampleinstall

install/demo/linux/Makefile.fpc

@@ -4,3 +4,6 @@
 
 [target]
 programs_linux=daemon
+
+[default]
+fpcdir=../..

install/demo/modex/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/24]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -91,6 +91,14 @@ else
 override FPCDIR=wrong
 endif
 ifeq ($(FPCDIR),wrong)
+override FPCDIR=../..
+ifeq ($(wildcard $(FPCDIR)/rtl),)
+ifeq ($(wildcard $(FPCDIR)/units),)
+override FPCDIR=wrong
+endif
+endif
+endif
+ifeq ($(FPCDIR),wrong)
 ifdef inUnix
 override FPCDIR=/usr/local/lib/fpc/$(FPC_VERSION)
 ifeq ($(wildcard $(FPCDIR)/units),)
@@ -107,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 ifeq ($(OS_TARGET),go32v2)
 override TARGET_PROGRAMS+=voxel
 endif
@@ -168,6 +176,9 @@ endif
 ifndef LD
 LD=ld
 endif
+ifndef RC
+RC=rc
+endif
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -536,6 +547,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -632,14 +646,13 @@ fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
 	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
-ifdef EXAMPLESOURCEFILES
+ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
+endif
+ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif
 ifdef TARGET_EXAMPLEDIRS
-ifndef EXAMPLESOURCEFILES
-	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
 fpc_distinstall: fpc_install fpc_exampleinstall

install/demo/modex/Makefile.fpc

@@ -4,3 +4,6 @@
 
 [target]
 programs_go32v2=voxel
+
+[default]
+fpcdir=../..

install/demo/os2/Makefile.fpc

@@ -2,9 +2,12 @@
 #   Makefile.fpc for FPC OS/2 demos (part of FPC demo package)
 #
 
-[targets]
+[target]
 programs_os2=basicpm pmdemo1 getctry
 
+[default]
+fpcdir=../..
+
 [rules]
 basicpm.exe: basicpm.pas
         $(COMPILER) -Dw -Ch8096 -Cs32728 basicpm.pas
@@ -14,7 +17,3 @@ pmdemo1.exe: pmdemo1.pp pmdemo1.res
 
 pmdemo1.res: pmdemo1.rc pmdemo1.h
         $(RC) -r pmdemo1
-
-[dirs]
-fpcdir=../..
-targetdir=.

install/demo/text/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/24]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -91,6 +91,14 @@ else
 override FPCDIR=wrong
 endif
 ifeq ($(FPCDIR),wrong)
+override FPCDIR=../..
+ifeq ($(wildcard $(FPCDIR)/rtl),)
+ifeq ($(wildcard $(FPCDIR)/units),)
+override FPCDIR=wrong
+endif
+endif
+endif
+ifeq ($(FPCDIR),wrong)
 ifdef inUnix
 override FPCDIR=/usr/local/lib/fpc/$(FPC_VERSION)
 ifeq ($(wildcard $(FPCDIR)/units),)
@@ -107,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override TARGET_PROGRAMS+=eratos qsort hello blackbox magic lines
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
@@ -166,6 +174,9 @@ endif
 ifndef LD
 LD=ld
 endif
+ifndef RC
+RC=rc
+endif
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -534,6 +545,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -630,14 +644,13 @@ fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
 	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
-ifdef EXAMPLESOURCEFILES
+ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
+endif
+ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif
 ifdef TARGET_EXAMPLEDIRS
-ifndef EXAMPLESOURCEFILES
-	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
 fpc_distinstall: fpc_install fpc_exampleinstall

install/demo/text/Makefile.fpc

@@ -4,3 +4,6 @@
 
 [target]
 programs=eratos qsort hello blackbox magic lines
+
+[default]
+fpcdir=../..

install/demo/win32/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/24]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -91,6 +91,14 @@ else
 override FPCDIR=wrong
 endif
 ifeq ($(FPCDIR),wrong)
+override FPCDIR=../..
+ifeq ($(wildcard $(FPCDIR)/rtl),)
+ifeq ($(wildcard $(FPCDIR)/units),)
+override FPCDIR=wrong
+endif
+endif
+endif
+ifeq ($(FPCDIR),wrong)
 ifdef inUnix
 override FPCDIR=/usr/local/lib/fpc/$(FPC_VERSION)
 ifeq ($(wildcard $(FPCDIR)/units),)
@@ -107,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 ifeq ($(OS_TARGET),win32)
 override TARGET_PROGRAMS+=winhello menu dlltest testdll edit
 endif
@@ -168,6 +176,9 @@ endif
 ifndef LD
 LD=ld
 endif
+ifndef RC
+RC=rc
+endif
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -536,6 +547,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -632,14 +646,13 @@ fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
 	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
-ifdef EXAMPLESOURCEFILES
+ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
+endif
+ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif
 ifdef TARGET_EXAMPLEDIRS
-ifndef EXAMPLESOURCEFILES
-	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
 fpc_distinstall: fpc_install fpc_exampleinstall

install/demo/win32/Makefile.fpc

@@ -4,3 +4,6 @@
 
 [target]
 programs_win32=winhello menu dlltest testdll edit
+
+[default]
+fpcdir=../..

install/fpinst/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/24]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=fpinst
 override PACKAGE_VERSION=1.0.5
 ifeq ($(OS_TARGET),linux)
@@ -195,6 +195,9 @@ endif
 ifndef LD
 LD=ld
 endif
+ifndef RC
+RC=rc
+endif
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -595,6 +598,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -691,14 +697,13 @@ fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
 	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
-ifdef EXAMPLESOURCEFILES
+ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
+endif
+ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif
 ifdef TARGET_EXAMPLEDIRS
-ifndef EXAMPLESOURCEFILES
-	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
 fpc_distinstall: fpc_install fpc_exampleinstall
@@ -768,7 +773,9 @@ endif
 fpc_zipsourceinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
 fpc_zipexampleinstall:
+ifdef HASEXAMPLES
 	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean

packages/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/11]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 ifeq ($(OS_TARGET),linux)
 override TARGET_DIRS+=zlib ncurses x11 gtk syslog inet uncgi mysql ibase postgres oracle opengl forms svgalib ggi libpng libgd utmp paszlib gdbint cmem regexpr unzip
 endif
@@ -516,6 +516,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -602,7 +605,7 @@ fpc_sourceinstall: distclean
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif	
+endif
 ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif

packages/cmem/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/11]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=cmem
 override PACKAGE_VERSION=1.0.5
 override TARGET_UNITS+=cmem
@@ -548,6 +548,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -657,7 +660,7 @@ fpc_sourceinstall: distclean
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif	
+endif
 ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif

packages/forms/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/11]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=forms
 override PACKAGE_VERSION=1.0.5
 override TARGET_PROGRAMS+=fd2pascal
@@ -596,6 +596,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -717,7 +720,7 @@ fpc_sourceinstall: distclean
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif	
+endif
 ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif

packages/forms/demo/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/11]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override TARGET_PROGRAMS+=pushme yesno pushbutton touchbutton minput inputall choice butttypes colsel colsel1 buttonall chartall positioner secretinput cursor fdial ldial ndial invslider sliderall borderwidth boxtype xyplotover arrowbutton browserop browserall chartstrip colbrowser counter fbrowse1 fbrowse flclock fonts goodies lalign ll longlabel menu objinactive objpos newbutton multilabel objreturn
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
@@ -624,6 +624,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -722,7 +725,7 @@ fpc_sourceinstall: distclean
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif	
+endif
 ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif

packages/gdbint/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/11]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=gdbint
 override PACKAGE_VERSION=1.0.5
 override TARGET_UNITS+=gdbint gdbcon
@@ -565,6 +565,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -674,7 +677,7 @@ fpc_sourceinstall: distclean
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif	
+endif
 ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif

packages/gdbint/libgdb/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/11]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -107,8 +107,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -493,6 +493,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -579,7 +582,7 @@ fpc_sourceinstall: distclean
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif	
+endif
 ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif

packages/gdbm/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/11]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -107,8 +107,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -493,6 +493,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -579,7 +582,7 @@ fpc_sourceinstall: distclean
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif	
+endif
 ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif

packages/ggi/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/11]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=ggi
 override PACKAGE_VERSION=1.0.5
 override TARGET_UNITS+=gii ggi ggi2d
@@ -563,6 +563,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -672,7 +675,7 @@ fpc_sourceinstall: distclean
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif	
+endif
 ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif

packages/gtk/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/11]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=gtk
 override PACKAGE_VERSION=1.0.5
 override TARGET_DIRS+=gtkgl
@@ -626,6 +626,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -735,7 +738,7 @@ fpc_sourceinstall: distclean
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif	
+endif
 ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif

packages/gtk/examples/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/11]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override TARGET_DIRS+=tutorial
 override TARGET_PROGRAMS+=entry notebook scribble clist ttt_test pixmap list progressbar filesel
 override CLEAN_UNITS+=tictactoe
@@ -654,6 +654,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -752,7 +755,7 @@ fpc_sourceinstall: distclean
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif	
+endif
 ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif

packages/gtk/examples/tutorial/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/11]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -619,6 +619,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -705,7 +708,7 @@ fpc_sourceinstall: distclean
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif	
+endif
 ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif

packages/gtk/gtkgl/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/11]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=gtk
 override TARGET_UNITS+=gtkglarea
 override TARGET_EXAMPLES+=gtkgldemo
@@ -623,6 +623,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -732,7 +735,7 @@ fpc_sourceinstall: distclean
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif	
+endif
 ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif

packages/ibase/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/11]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=ibase
 override PACKAGE_VERSION=1.0.5
 override TARGET_UNITS+=ibase40 ibase60
@@ -563,6 +563,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -672,7 +675,7 @@ fpc_sourceinstall: distclean
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif	
+endif
 ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif

packages/inet/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/11]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=inet
 override PACKAGE_VERSION=1.0.5
 override TARGET_UNITS+=inet
@@ -548,6 +548,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -657,7 +660,7 @@ fpc_sourceinstall: distclean
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif	
+endif
 ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif

packages/libgd/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/11]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=libgd
 override PACKAGE_VERSION=1.0.5
 override TARGET_UNITS+=gd
@@ -563,6 +563,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -672,7 +675,7 @@ fpc_sourceinstall: distclean
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif	
+endif
 ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif

packages/libpng/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/11]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=libpng
 override PACKAGE_VERSION=1.0.5
 override TARGET_UNITS+=png
@@ -594,6 +594,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -688,7 +691,7 @@ fpc_sourceinstall: distclean
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif	
+endif
 ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif

packages/mysql/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/11]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=mysql
 override PACKAGE_VERSION=1.0.5
 override TARGET_UNITS+=mysql_com mysql_version mysql
@@ -563,6 +563,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -672,7 +675,7 @@ fpc_sourceinstall: distclean
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif	
+endif
 ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif

packages/ncurses/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/11]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=ncurses
 override PACKAGE_VERSION=1.0.5
 override TARGET_UNITS+=ncurses panel ncrt ocrt menu
@@ -563,6 +563,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -672,7 +675,7 @@ fpc_sourceinstall: distclean
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif	
+endif
 ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif

packages/opengl/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/11]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=opengl
 override PACKAGE_VERSION=1.0.5
 override TARGET_UNITS+=gl glut
@@ -599,6 +599,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -708,7 +711,7 @@ fpc_sourceinstall: distclean
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif	
+endif
 ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif

packages/opengl/build/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/11]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all_units
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -107,8 +107,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override TARGET_PROGRAMS+=c_gen
 override TARGET_UNITS+=buildgl
 ifndef ECHO
@@ -703,6 +703,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -809,7 +812,7 @@ fpc_sourceinstall: distclean
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif	
+endif
 ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif

packages/opengl/examples/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/11]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -107,8 +107,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override TARGET_PROGRAMS+=glutdemo morph3d bounce
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
@@ -612,6 +612,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -710,7 +713,7 @@ fpc_sourceinstall: distclean
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif	
+endif
 ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif

packages/oracle/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/11]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=oracle
 override PACKAGE_VERSION=1.0.5
 override TARGET_UNITS+=oraoci
@@ -563,6 +563,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -672,7 +675,7 @@ fpc_sourceinstall: distclean
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif	
+endif
 ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif

packages/oracle/example/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/11]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override TARGET_UNITS+=oraclew
 override TARGET_EXAMPLES+=test01
 ifndef ECHO
@@ -743,6 +743,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -852,7 +855,7 @@ fpc_sourceinstall: distclean
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif	
+endif
 ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif

packages/paszlib/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/11]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=paszlib
 override PACKAGE_VERSION=1.0.5
 override TARGET_UNITS+=paszlib adler gzcrc gzcrcasm gzio infblock infcodes inffast inftrees infutil strutils trees zcompres zdeflate zinflate zbase zuncompr zutil
@@ -548,6 +548,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -657,7 +660,7 @@ fpc_sourceinstall: distclean
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif	
+endif
 ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif

packages/postgres/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/11]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=postgres
 override PACKAGE_VERSION=1.0.5
 override TARGET_UNITS+=dllist postgres
@@ -563,6 +563,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -672,7 +675,7 @@ fpc_sourceinstall: distclean
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif	
+endif
 ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif

packages/regexpr/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/11]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=regexpr
 override PACKAGE_VERSION=1.0.5
 override TARGET_UNITS+=regexpr
@@ -549,6 +549,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -658,7 +661,7 @@ fpc_sourceinstall: distclean
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif	
+endif
 ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif

packages/svgalib/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/11]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=svgalib
 override PACKAGE_VERSION=1.0.5
 override TARGET_UNITS+=svgalib vgamouse
@@ -563,6 +563,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -672,7 +675,7 @@ fpc_sourceinstall: distclean
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif	
+endif
 ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif

packages/syslog/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/11]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=syslog
 override PACKAGE_VERSION=1.0.5
 override TARGET_UNITS+=systemlog
@@ -563,6 +563,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -672,7 +675,7 @@ fpc_sourceinstall: distclean
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif	
+endif
 ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif

packages/uncgi/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/11]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=uncgi
 override PACKAGE_VERSION=1.0.5
 override TARGET_UNITS+=uncgi
@@ -548,6 +548,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -657,7 +660,7 @@ fpc_sourceinstall: distclean
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif	
+endif
 ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif

packages/unzip/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/11]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=unzip
 override PACKAGE_VERSION=1.0.5
 override TARGET_UNITS+=ziptypes unzip
@@ -550,6 +550,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -644,7 +647,7 @@ fpc_sourceinstall: distclean
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif	
+endif
 ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif

packages/utmp/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/11]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=utmp
 override PACKAGE_VERSION=1.0.5
 override TARGET_UNITS+=utmp
@@ -548,6 +548,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -657,7 +660,7 @@ fpc_sourceinstall: distclean
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif	
+endif
 ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif

packages/x11/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/11]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=x11
 override PACKAGE_VERSION=1.0.5
 override TARGET_UNITS+=x xlib xutil xresource xcms xshm xrender
@@ -562,6 +562,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -656,7 +659,7 @@ fpc_sourceinstall: distclean
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif	
+endif
 ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif

packages/zlib/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/11]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=zlib
 override PACKAGE_VERSION=1.0.5
 override TARGET_UNITS+=zlib
@@ -562,6 +562,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -656,7 +659,7 @@ fpc_sourceinstall: distclean
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif	
+endif
 ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif

rtl/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/24]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=rtl
 override PACKAGE_VERSION=1.0.5
 override DEFAULT_DIR=$(OS_TARGET)
@@ -177,6 +177,9 @@ endif
 ifndef LD
 LD=ld
 endif
+ifndef RC
+RC=rc
+endif
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -502,6 +505,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -586,14 +592,13 @@ fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
 	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
-ifdef EXAMPLESOURCEFILES
+ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
+endif
+ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif
 ifdef TARGET_EXAMPLEDIRS
-ifndef EXAMPLESOURCEFILES
-	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
 fpc_distinstall: fpc_install fpc_exampleinstall
@@ -663,7 +668,9 @@ endif
 fpc_zipsourceinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
 fpc_zipexampleinstall:
+ifdef HASEXAMPLES
 	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean

rtl/freebsd/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/24]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -117,8 +117,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=rtl
 RTL=..
 INC=$(RTL)/inc
@@ -202,6 +202,9 @@ endif
 ifndef LD
 LD=ld
 endif
+ifndef RC
+RC=rc
+endif
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -527,6 +530,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -638,14 +644,13 @@ fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
 	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
-ifdef EXAMPLESOURCEFILES
+ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
+endif
+ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif
 ifdef TARGET_EXAMPLEDIRS
-ifndef EXAMPLESOURCEFILES
-	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
 fpc_distinstall: fpc_install fpc_exampleinstall

rtl/go32v1/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/24]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -117,8 +117,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=rtl
 RTL=..
 INC=../inc
@@ -187,6 +187,9 @@ endif
 ifndef LD
 LD=ld
 endif
+ifndef RC
+RC=rc
+endif
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -512,6 +515,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -619,14 +625,13 @@ fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
 	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
-ifdef EXAMPLESOURCEFILES
+ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
+endif
+ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif
 ifdef TARGET_EXAMPLEDIRS
-ifndef EXAMPLESOURCEFILES
-	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
 fpc_distinstall: fpc_install fpc_exampleinstall

rtl/go32v2/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/24]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -117,8 +117,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=rtl
 RTL=..
 INC=../inc
@@ -194,6 +194,9 @@ endif
 ifndef LD
 LD=ld
 endif
+ifndef RC
+RC=rc
+endif
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -519,6 +522,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -630,14 +636,13 @@ fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
 	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
-ifdef EXAMPLESOURCEFILES
+ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
+endif
+ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif
 ifdef TARGET_EXAMPLEDIRS
-ifndef EXAMPLESOURCEFILES
-	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
 fpc_distinstall: fpc_install fpc_exampleinstall

rtl/linux/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/24]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -117,8 +117,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=rtl
 RTL=..
 INC=$(RTL)/inc
@@ -203,6 +203,9 @@ endif
 ifndef LD
 LD=ld
 endif
+ifndef RC
+RC=rc
+endif
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -528,6 +531,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -639,14 +645,13 @@ fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
 	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
-ifdef EXAMPLESOURCEFILES
+ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
+endif
+ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif
 ifdef TARGET_EXAMPLEDIRS
-ifndef EXAMPLESOURCEFILES
-	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
 fpc_distinstall: fpc_install fpc_exampleinstall

rtl/os2/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/24]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -117,8 +117,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=rtl
 RTL=..
 INC=$(RTL)/inc
@@ -193,6 +193,9 @@ endif
 ifndef LD
 LD=ld
 endif
+ifndef RC
+RC=rc
+endif
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -518,6 +521,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -629,14 +635,13 @@ fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
 	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
-ifdef EXAMPLESOURCEFILES
+ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
+endif
+ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif
 ifdef TARGET_EXAMPLEDIRS
-ifndef EXAMPLESOURCEFILES
-	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
 fpc_distinstall: fpc_install fpc_exampleinstall

rtl/win32/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/24]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -117,8 +117,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=rtl
 RTL=..
 INC=$(RTL)/inc
@@ -198,6 +198,9 @@ endif
 ifndef LD
 LD=ld
 endif
+ifndef RC
+RC=rc
+endif
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -523,6 +526,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -634,14 +640,13 @@ fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
 	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
-ifdef EXAMPLESOURCEFILES
+ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
+endif
+ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif
 ifdef TARGET_EXAMPLEDIRS
-ifndef EXAMPLESOURCEFILES
-	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
 fpc_distinstall: fpc_install fpc_exampleinstall

tests/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/24]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: allexectests
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -173,6 +173,9 @@ endif
 ifndef LD
 LD=ld
 endif
+ifndef RC
+RC=rc
+endif
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -498,6 +501,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -582,14 +588,13 @@ fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
 	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
-ifdef EXAMPLESOURCEFILES
+ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
+endif
+ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif
 ifdef TARGET_EXAMPLEDIRS
-ifndef EXAMPLESOURCEFILES
-	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
 fpc_distinstall: fpc_install fpc_exampleinstall

tests/units/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/24]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override TARGET_UNITS+=erroru
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
@@ -174,6 +174,9 @@ endif
 ifndef LD
 LD=ld
 endif
+ifndef RC
+RC=rc
+endif
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -542,6 +545,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -634,14 +640,13 @@ fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
 	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
-ifdef EXAMPLESOURCEFILES
+ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
+endif
+ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif
 ifdef TARGET_EXAMPLEDIRS
-ifndef EXAMPLESOURCEFILES
-	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
 fpc_distinstall: fpc_install fpc_exampleinstall

utils/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/24]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,13 +115,13 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=fputils
-override PACKAGE_VERSION=1.1
+override PACKAGE_VERSION=1.05
 override TARGET_DIRS+=fpcm tply h2pas fprcp
-override TARGET_PROGRAMS+=ppufiles ppudump ppumove ppdep ptop rstconv data2inc delp bin2obj postw32
-override CLEAN_UNITS+=ppu ptopu makeini crc
+override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32
+override CLEAN_UNITS+=ptopu
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -178,6 +178,9 @@ endif
 ifndef LD
 LD=ld
 endif
+ifndef RC
+RC=rc
+endif
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -711,6 +714,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -807,14 +813,13 @@ fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
 	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
-ifdef EXAMPLESOURCEFILES
+ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
+endif
+ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif
 ifdef TARGET_EXAMPLEDIRS
-ifndef EXAMPLESOURCEFILES
-	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
 fpc_distinstall: fpc_install fpc_exampleinstall
@@ -884,7 +889,9 @@ endif
 fpc_zipsourceinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
 fpc_zipexampleinstall:
+ifdef HASEXAMPLES
 	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
@@ -1186,10 +1193,7 @@ info: fpc_info $(addsuffix _info,$(TARGET_DIRS))
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
-ppu$(PPUEXT): ppu.pas
-ppudump$(EXEEXT): ppudump.pp ppu$(PPUEXT)
-ppumove$(EXEEXT): ppumove.pp ppu$(PPUEXT)
 ptop$(EXEEXT): ptop.pp ptopu$(PPUEXT)
 ptopu$(PPUEXT): ptopu.pp
 ppdep$(EXEEXT): ppdep.pp
-unexport PPUFILES PPUMOVE DATA2INC
+unexport DATA2INC

utils/Makefile.fpc

@@ -4,32 +4,23 @@
 
 [package]
 name=fputils
-version=1.1
+version=1.05
 
 [target]
 dirs=fpcm tply h2pas fprcp
-programs=ppufiles ppudump ppumove ppdep ptop rstconv data2inc delp bin2obj postw32
-
-[clean]
-units=ppu ptopu makeini crc
+programs=ppdep ptop rstconv data2inc delp bin2obj postw32
 
 [require]
 packages=fcl
 
+[clean]
+units=ptopu
+
 [default]
 fpcdir=..
 
 
 [rules]
-#
-# PPU Tools
-#
-ppu$(PPUEXT): ppu.pas
-
-ppudump$(EXEEXT): ppudump.pp ppu$(PPUEXT)
-
-ppumove$(EXEEXT): ppumove.pp ppu$(PPUEXT)
-
 #
 # Pascal beautifier
 #
@@ -48,4 +39,4 @@ ppdep$(EXEEXT): ppdep.pp
 # the path, so are not valid for the subdirs
 #
 
-unexport PPUFILES PPUMOVE DATA2INC
+unexport DATA2INC

utils/bin2obj.pp

@@ -18,13 +18,24 @@ program bin2obj;
 
 {$mode objfpc}
 
+{$ifdef linux}
+  {$define unix}
+{$endif}
+{$ifdef freebsd}
+  {$define unix}
+{$endif}
+
 uses classes,getopts, iostream,zstream,idea,sysutils
 {$ifdef unix}
+  {$ifdef ver1_0}
+  ,linux
+  {$else}
   ,unix
+  {$endif}
 {$else}
   ,dos
 {$endif}
-;
+  ;
 
 var
   ConstName,
@@ -263,7 +274,10 @@ end.
 
 {
   $Log$
-  Revision 1.2  2001-01-29 21:48:26  peter
+  Revision 1.3  2001-04-25 22:45:45  peter
+    * regenerated
+
+  Revision 1.2  2001/01/29 21:48:26  peter
     * linux -> unix
 
   Revision 1.1  2000/07/13 10:16:21  michael

utils/fpcm/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/24]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override TARGET_PROGRAMS+=fpcmake
 override TARGET_RSTS+=fpcmmain
 override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr
@@ -176,6 +176,9 @@ endif
 ifndef LD
 LD=ld
 endif
+ifndef RC
+RC=rc
+endif
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -709,6 +712,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -809,14 +815,13 @@ fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
 	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
-ifdef EXAMPLESOURCEFILES
+ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
+endif
+ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif
 ifdef TARGET_EXAMPLEDIRS
-ifndef EXAMPLESOURCEFILES
-	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
 fpc_distinstall: fpc_install fpc_exampleinstall

utils/fprcp/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/24]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override TARGET_PROGRAMS+=fprcp
 override CLEAN_UNITS+=comments expr pasprep
 ifndef ECHO
@@ -175,6 +175,9 @@ endif
 ifndef LD
 LD=ld
 endif
+ifndef RC
+RC=rc
+endif
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -543,6 +546,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -639,14 +645,13 @@ fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
 	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
-ifdef EXAMPLESOURCEFILES
+ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
+endif
+ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif
 ifdef TARGET_EXAMPLEDIRS
-ifndef EXAMPLESOURCEFILES
-	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
 fpc_distinstall: fpc_install fpc_exampleinstall

utils/h2pas/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/24]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override TARGET_PROGRAMS+=h2pas h2paspp
 override CLEAN_UNITS+=options lexlib scan yacclib converu
 override COMPILER_OPTIONS+=-Sg
@@ -176,6 +176,9 @@ endif
 ifndef LD
 LD=ld
 endif
+ifndef RC
+RC=rc
+endif
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -544,6 +547,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -640,14 +646,13 @@ fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
 	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
-ifdef EXAMPLESOURCEFILES
+ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
+endif
+ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif
 ifdef TARGET_EXAMPLEDIRS
-ifndef EXAMPLESOURCEFILES
-	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
 fpc_distinstall: fpc_install fpc_exampleinstall

utils/simulator/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/24]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override TARGET_PROGRAMS+=alphasim
 override CLEAN_UNITS+=mm64 fastmm64 simlib simbase
 ifndef ECHO
@@ -175,6 +175,9 @@ endif
 ifndef LD
 LD=ld
 endif
+ifndef RC
+RC=rc
+endif
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -543,6 +546,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -639,14 +645,13 @@ fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
 	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
-ifdef EXAMPLESOURCEFILES
+ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
+endif
+ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif
 ifdef TARGET_EXAMPLEDIRS
-ifndef EXAMPLESOURCEFILES
-	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
 fpc_distinstall: fpc_install fpc_exampleinstall

utils/tply/Makefile

@@ -1,13 +1,13 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/24]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH=$(subst :, ,$(PATH))
+SEARCHPATH:=$(subst :, ,$(PATH))
 else
-SEARCHPATH=$(subst ;, ,$(PATH))
+SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
@@ -50,7 +50,7 @@ endif
 ifdef inUnix
 PATHSEP=/
 else
-PATHSEP=$(subst /,\,/)
+PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(shell $(PWD))
@@ -115,8 +115,8 @@ endif
 endif
 endif
 endif
-UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override TARGET_PROGRAMS+=plex pyacc
 override TARGET_UNITS+=lexlib yacclib
 override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl
@@ -177,6 +177,9 @@ endif
 ifndef LD
 LD=ld
 endif
+ifndef RC
+RC=rc
+endif
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -545,6 +548,9 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 ifeq ($(OS_SOURCE),win32)
+USEENV=1
+endif
+ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
@@ -649,14 +655,13 @@ fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
 	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
-ifdef EXAMPLESOURCEFILES
+ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
+endif
+ifdef EXAMPLESOURCEFILES
 	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
 endif
 ifdef TARGET_EXAMPLEDIRS
-ifndef EXAMPLESOURCEFILES
-	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
 fpc_distinstall: fpc_install fpc_exampleinstall