* gecho, gdate fixes

  * distinstall target rewrite to not install things twice

compiler/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/28]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -182,7 +182,7 @@ override COMPILER_INCLUDEDIR+=$(CPU_TARGET)
 override COMPILER_UNITDIR+=$(CPU_TARGET) targets
 override COMPILER_TARGETDIR+=.
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -265,9 +265,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -733,6 +733,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
+.PHONY: fpc_distinstall
 fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR
@@ -989,7 +990,7 @@ smart: fpc_smart $(addsuffix _smart,$(TARGET_DIRS))
 shared: fpc_shared $(addsuffix _shared,$(TARGET_DIRS))
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall $(addsuffix _exampleinstall,$(TARGET_DIRS))
-distinstall: fpc_distinstall $(addsuffix _distinstall,$(TARGET_DIRS))
+distinstall: fpc_distinstall
 zipinstall: fpc_zipinstall
 zipsourceinstall: fpc_zipsourceinstall
 zipexampleinstall: fpc_zipexampleinstall $(addsuffix _zipexampleinstall,$(TARGET_DIRS))

compiler/new/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -173,7 +173,7 @@ override COMPILER_INCLUDEDIR+=$(OLDDIR)/$(CPU_TARGET) $(OLDDIR)
 override COMPILER_UNITDIR+=$(OLDDIR)/$(CPU_TARGET)
 override COMPILER_TARGETDIR+=.
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -256,9 +256,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -724,6 +724,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
+.PHONY: fpc_distinstall
 fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR

compiler/utils/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/28]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -124,7 +124,7 @@ override COMPILER_UNITDIR+=..
 override COMPILER_SOURCEDIR+=..
 override COMPILER_TARGETDIR+=.
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -207,9 +207,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -687,7 +687,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -816,7 +815,7 @@ shared: fpc_shared
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
+distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall:

demo/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -125,7 +125,7 @@ ifeq ($(OS_TARGET),os2)
 override TARGET_DIRS+=os2
 endif
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -208,9 +208,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -633,6 +633,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
+.PHONY: fpc_distinstall
 fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR
@@ -1081,7 +1082,7 @@ shared: fpc_shared $(addsuffix _shared,$(TARGET_DIRS))
 install: fpc_install $(addsuffix _install,$(TARGET_DIRS))
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall $(addsuffix _exampleinstall,$(TARGET_DIRS))
-distinstall: fpc_distinstall $(addsuffix _distinstall,$(TARGET_DIRS))
+distinstall: fpc_distinstall
 zipinstall: fpc_zipinstall
 zipsourceinstall: fpc_zipsourceinstall
 zipexampleinstall: fpc_zipexampleinstall $(addsuffix _zipexampleinstall,$(TARGET_DIRS))

demo/graph/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -123,7 +123,7 @@ endif
 override TARGET_PROGRAMS+=fpctris mandel samegame quad maze gravwars
 override TARGET_UNITS+=gameunit
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -206,9 +206,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -694,7 +694,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -822,7 +821,7 @@ shared: fpc_shared
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
+distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall:

demo/linux/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -121,7 +121,7 @@ ifeq ($(OS_TARGET),linux)
 override TARGET_PROGRAMS+=daemon
 endif
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -204,9 +204,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -684,7 +684,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -813,7 +812,7 @@ shared: fpc_shared
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
+distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall:

demo/modex/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -121,7 +121,7 @@ ifeq ($(OS_TARGET),go32v2)
 override TARGET_PROGRAMS+=voxel
 endif
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -204,9 +204,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -684,7 +684,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -813,7 +812,7 @@ shared: fpc_shared
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
+distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall:

demo/os2/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -121,7 +121,7 @@ ifeq ($(OS_TARGET),os2)
 override TARGET_PROGRAMS+=basicpm pmdemo1 getctry
 endif
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -204,9 +204,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -684,7 +684,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -813,7 +812,7 @@ shared: fpc_shared
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
+distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall:

demo/text/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -119,7 +119,7 @@ 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))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -202,9 +202,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -682,7 +682,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -811,7 +810,7 @@ shared: fpc_shared
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
+distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall:

demo/win32/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -121,7 +121,7 @@ ifeq ($(OS_TARGET),win32)
 override TARGET_PROGRAMS+=winhello menu dlltest testdll edit
 endif
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -204,9 +204,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -684,7 +684,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -813,7 +812,7 @@ shared: fpc_shared
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
+distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall:

fcl/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -144,7 +144,7 @@ endif
 override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
 override COMPILER_TARGETDIR+=$(OS_TARGET)
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -227,9 +227,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -855,6 +855,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
+.PHONY: fpc_distinstall
 fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR
@@ -1215,7 +1216,7 @@ shared: fpc_shared $(addsuffix _shared,$(TARGET_DIRS))
 install: fpc_install $(addsuffix _install,$(TARGET_DIRS))
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall $(addsuffix _exampleinstall,$(TARGET_DIRS))
-distinstall: fpc_distinstall $(addsuffix _distinstall,$(TARGET_DIRS))
+distinstall: fpc_distinstall
 zipinstall: fpc_zipinstall
 zipsourceinstall: fpc_zipsourceinstall
 zipexampleinstall: fpc_zipexampleinstall $(addsuffix _zipexampleinstall,$(TARGET_DIRS))

fcl/db/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -131,7 +131,7 @@ override INSTALL_FPCPACKAGE=y
 override COMPILER_OPTIONS+=-S2
 override COMPILER_TARGETDIR+=../$(OS_TARGET)
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -214,9 +214,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -778,7 +778,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -1073,7 +1072,7 @@ shared: fpc_shared $(addsuffix _shared,$(TARGET_DIRS))
 install: fpc_install $(addsuffix _install,$(TARGET_DIRS))
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall $(addsuffix _exampleinstall,$(TARGET_DIRS))
-distinstall: fpc_distinstall $(addsuffix _distinstall,$(TARGET_DIRS))
+distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall: $(addsuffix _zipexampleinstall,$(TARGET_DIRS))

fcl/db/dbase/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -124,7 +124,7 @@ override INSTALL_FPCPACKAGE=y
 override COMPILER_OPTIONS+=-S2 -Sh
 override COMPILER_TARGETDIR+=../../$(OS_TARGET)
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -207,9 +207,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -698,7 +698,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -827,7 +826,7 @@ shared: fpc_shared
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
+distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall:

fcl/db/interbase/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -124,7 +124,7 @@ override INSTALL_FPCPACKAGE=y
 override COMPILER_OPTIONS+=-S2
 override COMPILER_TARGETDIR+=../../$(OS_TARGET)
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -207,9 +207,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -745,7 +745,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -874,7 +873,7 @@ shared: fpc_shared
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
+distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall:

fcl/db/mysql/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -124,7 +124,7 @@ override INSTALL_FPCPACKAGE=y
 override COMPILER_OPTIONS+=-S2
 override COMPILER_TARGETDIR+=../../$(OS_TARGET)
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -207,9 +207,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -745,7 +745,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -874,7 +873,7 @@ shared: fpc_shared
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
+distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall:

fcl/db/tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -121,7 +121,7 @@ override TARGET_PROGRAMS+=testds createds tested
 override INSTALL_FPCPACKAGE=y
 override COMPILER_OPTIONS+=-S2
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -204,9 +204,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -849,7 +849,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -978,7 +977,7 @@ shared: fpc_shared
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
+distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall:

fcl/shedit/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -124,7 +124,7 @@ override INSTALL_FPCPACKAGE=y
 override COMPILER_OPTIONS+=-S2
 override COMPILER_TARGETDIR+=../$(OS_TARGET)
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -207,9 +207,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -698,7 +698,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -867,7 +866,7 @@ shared: fpc_shared
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
+distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall:

fcl/shedit/gtk/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -121,7 +121,7 @@ override TARGET_PROGRAMS+=gtkdemo
 override TARGET_UNITS+=gtkshedit
 override INSTALL_FPCPACKAGE=y
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -204,9 +204,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -949,7 +949,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -1078,7 +1077,7 @@ shared: fpc_shared
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
+distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall:

fcl/tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -127,7 +127,7 @@ endif
 override INSTALL_FPCPACKAGE=y
 override COMPILER_OPTIONS+=-S2
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -210,9 +210,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -855,7 +855,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -984,7 +983,7 @@ shared: fpc_shared
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
+distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall:

fcl/xml/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -123,7 +123,7 @@ override INSTALL_FPCPACKAGE=y
 override COMPILER_OPTIONS+=-S2
 override COMPILER_TARGETDIR+=../$(OS_TARGET)
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -206,9 +206,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -682,7 +682,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -811,7 +810,7 @@ shared: fpc_shared
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
+distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall:

ide/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -123,7 +123,7 @@ override DEFAULT_DIR=text
 override TARGET_DIRS+=fake text
 override INSTALL_FPCPACKAGE=y
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -206,9 +206,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -631,6 +631,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
+.PHONY: fpc_distinstall
 fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR

ide/fake/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -111,7 +111,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override TARGET_DIRS+=compiler gdb
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -194,9 +194,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -619,7 +619,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -828,7 +827,7 @@ shared: fpc_shared $(addsuffix _shared,$(TARGET_DIRS))
 install: fpc_install $(addsuffix _install,$(TARGET_DIRS))
 sourceinstall: fpc_sourceinstall $(addsuffix _sourceinstall,$(TARGET_DIRS))
 exampleinstall: fpc_exampleinstall $(addsuffix _exampleinstall,$(TARGET_DIRS))
-distinstall: fpc_distinstall $(addsuffix _distinstall,$(TARGET_DIRS))
+distinstall: $(addsuffix _distinstall,$(TARGET_DIRS))
 zipinstall: $(addsuffix _zipinstall,$(TARGET_DIRS))
 zipsourceinstall: $(addsuffix _zipsourceinstall,$(TARGET_DIRS))
 zipexampleinstall: $(addsuffix _zipexampleinstall,$(TARGET_DIRS))

ide/fake/compiler/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -111,7 +111,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override TARGET_UNITS+=browcol compiler systems version comphook globtype tokens
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -194,9 +194,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -670,7 +670,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -799,7 +798,7 @@ shared: fpc_shared
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
+distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall:

ide/fake/gdb/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -111,7 +111,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override TARGET_UNITS+=gdbcon gdbint
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -194,9 +194,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -670,7 +670,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -799,7 +798,7 @@ shared: fpc_shared
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
+distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall:

ide/text/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -170,7 +170,7 @@ override COMPILER_OPTIONS+=-Sg
 override COMPILER_UNITDIR+=$(COMPILERDIR)
 override COMPILER_TARGETDIR+=.
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -253,9 +253,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -812,7 +812,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -979,7 +978,7 @@ smart: fpc_smart $(addsuffix _smart,$(TARGET_DIRS))
 shared: fpc_shared $(addsuffix _shared,$(TARGET_DIRS))
 sourceinstall: fpc_sourceinstall $(addsuffix _sourceinstall,$(TARGET_DIRS))
 exampleinstall: fpc_exampleinstall $(addsuffix _exampleinstall,$(TARGET_DIRS))
-distinstall: fpc_distinstall $(addsuffix _distinstall,$(TARGET_DIRS))
+distinstall: $(addsuffix _distinstall,$(TARGET_DIRS))
 zipinstall: $(addsuffix _zipinstall,$(TARGET_DIRS))
 zipsourceinstall: $(addsuffix _zipsourceinstall,$(TARGET_DIRS))
 zipexampleinstall: $(addsuffix _zipexampleinstall,$(TARGET_DIRS))

ide/text/compiler/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -124,7 +124,7 @@ override COMPILER_INCLUDEDIR+=$(FPCDIR)/compiler $(FPCDIR)/compiler/$(CPU_TARGET
 override COMPILER_UNITDIR+=$(FPCDIR)/compiler $(FPCDIR)/compiler/$(CPU_TARGET) $(FPCDIR)/compiler/targets
 override COMPILER_TARGETDIR+=.
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -207,9 +207,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -715,7 +715,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -842,7 +841,7 @@ smart: fpc_smart
 shared: fpc_shared
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
+distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall:

install/fpinst/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -141,7 +141,7 @@ endif
 override INSTALL_FPCPACKAGE=y
 override COMPILER_UNITDIR+=../ide/text
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -224,9 +224,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -736,6 +736,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
+.PHONY: fpc_distinstall
 fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR

packages/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -134,7 +134,7 @@ override TARGET_DIRS+=zlib ncurses x11 gtk syslog inet uncgi mysql ibase postgre
 endif
 override INSTALL_FPCPACKAGE=y
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -217,9 +217,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -642,7 +642,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -1740,7 +1739,7 @@ shared: fpc_shared $(addsuffix _shared,$(TARGET_DIRS))
 install: fpc_install $(addsuffix _install,$(TARGET_DIRS))
 sourceinstall: fpc_sourceinstall $(addsuffix _sourceinstall,$(TARGET_DIRS))
 exampleinstall: fpc_exampleinstall $(addsuffix _exampleinstall,$(TARGET_DIRS))
-distinstall: fpc_distinstall $(addsuffix _distinstall,$(TARGET_DIRS))
+distinstall: $(addsuffix _distinstall,$(TARGET_DIRS))
 zipinstall: $(addsuffix _zipinstall,$(TARGET_DIRS))
 zipsourceinstall: $(addsuffix _zipsourceinstall,$(TARGET_DIRS))
 zipexampleinstall: $(addsuffix _zipexampleinstall,$(TARGET_DIRS))

packages/cmem/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -123,7 +123,7 @@ override TARGET_UNITS+=cmem
 override TARGET_EXAMPLES+=testcmem
 override INSTALL_FPCPACKAGE=y
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -206,9 +206,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -697,6 +697,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
+.PHONY: fpc_distinstall
 fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR

packages/forms/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -124,7 +124,7 @@ override TARGET_UNITS+=forms
 override TARGET_EXAMPLEDIRS+=demo
 override INSTALL_FPCPACKAGE=y
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -207,9 +207,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -757,6 +757,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
+.PHONY: fpc_distinstall
 fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR

packages/forms/demo/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -120,7 +120,7 @@ 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
 override INSTALL_FPCPACKAGE=y
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -203,9 +203,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -762,7 +762,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -891,7 +890,7 @@ shared: fpc_shared
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
+distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall:

packages/gdbint/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -125,7 +125,7 @@ override INSTALL_FPCPACKAGE=y
 override COMPILER_OBJECTDIR+=libgdb/$(OS_TARGET)
 override COMPILER_LIBRARYDIR+=libgdb/$(OS_TARGET)
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -208,9 +208,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -714,6 +714,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
+.PHONY: fpc_distinstall
 fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR

packages/gdbint/libgdb/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -110,7 +110,7 @@ endif
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -193,9 +193,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -618,7 +618,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -746,7 +745,7 @@ shared: fpc_shared
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
+distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall:

packages/gdbm/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -111,7 +111,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override INSTALL_FPCPACKAGE=y
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -194,9 +194,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -619,7 +619,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -748,7 +747,7 @@ shared: fpc_shared
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
+distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall:

packages/ggi/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -123,7 +123,7 @@ override TARGET_UNITS+=gii ggi ggi2d
 override TARGET_EXAMPLES+=ggi1
 override INSTALL_FPCPACKAGE=y
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -206,9 +206,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -712,6 +712,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
+.PHONY: fpc_distinstall
 fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR

packages/gtk/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -126,7 +126,7 @@ override INSTALL_FPCPACKAGE=y
 override COMPILER_SOURCEDIR+=glib gdk gtk
 override COMPILER_TARGETDIR+=.
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -209,9 +209,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -775,6 +775,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
+.PHONY: fpc_distinstall
 fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR
@@ -1055,7 +1056,7 @@ shared: fpc_shared $(addsuffix _shared,$(TARGET_DIRS))
 install: fpc_install $(addsuffix _install,$(TARGET_DIRS))
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall $(addsuffix _exampleinstall,$(TARGET_DIRS))
-distinstall: fpc_distinstall $(addsuffix _distinstall,$(TARGET_DIRS))
+distinstall: fpc_distinstall
 zipinstall: fpc_zipinstall
 zipsourceinstall: fpc_zipsourceinstall
 zipexampleinstall: fpc_zipexampleinstall $(addsuffix _zipexampleinstall,$(TARGET_DIRS))

packages/gtk/examples/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -122,7 +122,7 @@ override TARGET_PROGRAMS+=entry notebook scribble clist ttt_test pixmap list pro
 override CLEAN_UNITS+=tictactoe
 override INSTALL_FPCPACKAGE=y
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -205,9 +205,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -792,7 +792,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -961,7 +960,7 @@ shared: fpc_shared $(addsuffix _shared,$(TARGET_DIRS))
 install: fpc_install $(addsuffix _install,$(TARGET_DIRS))
 sourceinstall: fpc_sourceinstall $(addsuffix _sourceinstall,$(TARGET_DIRS))
 exampleinstall: fpc_exampleinstall $(addsuffix _exampleinstall,$(TARGET_DIRS))
-distinstall: fpc_distinstall $(addsuffix _distinstall,$(TARGET_DIRS))
+distinstall: $(addsuffix _distinstall,$(TARGET_DIRS))
 zipinstall: $(addsuffix _zipinstall,$(TARGET_DIRS))
 zipsourceinstall: $(addsuffix _zipsourceinstall,$(TARGET_DIRS))
 zipexampleinstall: $(addsuffix _zipexampleinstall,$(TARGET_DIRS))

packages/gtk/examples/tutorial/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -119,7 +119,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override INSTALL_FPCPACKAGE=y
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -202,9 +202,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -745,7 +745,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -874,7 +873,7 @@ shared: fpc_shared
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
+distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall:

packages/gtk/gtkgl/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -123,7 +123,7 @@ override TARGET_EXAMPLES+=gtkgldemo
 override INSTALL_FPCPACKAGE=y
 override COMPILER_TARGETDIR+=..
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -206,9 +206,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -772,7 +772,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -901,7 +900,7 @@ shared: fpc_shared
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
+distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall:

packages/ibase/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -123,7 +123,7 @@ override TARGET_UNITS+=ibase40 ibase60
 override TARGET_EXAMPLES+=testib40 testib60
 override INSTALL_FPCPACKAGE=y
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -206,9 +206,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -712,6 +712,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
+.PHONY: fpc_distinstall
 fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR

packages/inet/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -123,7 +123,7 @@ override TARGET_UNITS+=inet
 override TARGET_EXAMPLES+=testinet pfinger
 override INSTALL_FPCPACKAGE=y
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -206,9 +206,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -697,6 +697,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
+.PHONY: fpc_distinstall
 fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR

packages/libgd/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -123,7 +123,7 @@ override TARGET_UNITS+=gd
 override TARGET_EXAMPLES+=gdtest
 override INSTALL_FPCPACKAGE=y
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -206,9 +206,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -712,6 +712,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
+.PHONY: fpc_distinstall
 fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR

packages/libpng/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -122,7 +122,7 @@ override PACKAGE_VERSION=1.0.5
 override TARGET_UNITS+=png
 override INSTALL_FPCPACKAGE=y
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -205,9 +205,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -728,6 +728,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
+.PHONY: fpc_distinstall
 fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR

packages/mysql/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -123,7 +123,7 @@ override TARGET_UNITS+=mysql_com mysql_version mysql
 override TARGET_EXAMPLES+=testdb
 override INSTALL_FPCPACKAGE=y
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -206,9 +206,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -712,6 +712,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
+.PHONY: fpc_distinstall
 fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR

packages/ncurses/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -123,7 +123,7 @@ override TARGET_UNITS+=ncurses panel ncrt ocrt menu
 override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo
 override INSTALL_FPCPACKAGE=y
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -206,9 +206,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -712,6 +712,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
+.PHONY: fpc_distinstall
 fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR

packages/opengl/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -131,7 +131,7 @@ override INSTALL_FPCPACKAGE=y
 override COMPILER_SOURCEDIR+=$(OS_TARGET)
 override COMPILER_TARGETDIR+=$(OS_TARGET)
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -214,9 +214,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -748,6 +748,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
+.PHONY: fpc_distinstall
 fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR

packages/opengl/build/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all_units
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -121,7 +121,7 @@ override TARGET_PROGRAMS+=c_gen
 override TARGET_UNITS+=buildgl
 override INSTALL_FPCPACKAGE=y
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -204,9 +204,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -857,7 +857,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -986,7 +985,7 @@ shared: fpc_shared
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
+distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall:

packages/opengl/examples/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -120,7 +120,7 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override TARGET_PROGRAMS+=glutdemo morph3d bounce
 override INSTALL_FPCPACKAGE=y
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -203,9 +203,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -758,7 +758,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -887,7 +886,7 @@ shared: fpc_shared
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
+distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall:

packages/oracle/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -123,7 +123,7 @@ override TARGET_UNITS+=oraoci
 override TARGET_EXAMPLEDIRS+=example
 override INSTALL_FPCPACKAGE=y
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -206,9 +206,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -712,6 +712,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
+.PHONY: fpc_distinstall
 fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR

packages/oracle/example/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -121,7 +121,7 @@ override TARGET_UNITS+=oraclew
 override TARGET_EXAMPLES+=test01
 override INSTALL_FPCPACKAGE=y
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -204,9 +204,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -892,7 +892,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -1021,7 +1020,7 @@ shared: fpc_shared
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
+distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall:

packages/paszlib/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -123,7 +123,7 @@ override TARGET_UNITS+=paszlib adler gzcrc gzio infblock infcodes inffast inftre
 override TARGET_EXAMPLES+=example minigzip
 override INSTALL_FPCPACKAGE=y
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -206,9 +206,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -697,6 +697,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
+.PHONY: fpc_distinstall
 fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR

packages/postgres/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -123,7 +123,7 @@ override TARGET_UNITS+=dllist postgres
 override TARGET_EXAMPLES+=testpg1 testpg2
 override INSTALL_FPCPACKAGE=y
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -206,9 +206,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -712,6 +712,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
+.PHONY: fpc_distinstall
 fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR

packages/regexpr/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -124,7 +124,7 @@ override TARGET_EXAMPLES+=testreg1
 override INSTALL_FPCPACKAGE=y
 override COMPILER_OPTIONS+=-S2
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -207,9 +207,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -698,6 +698,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
+.PHONY: fpc_distinstall
 fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR

packages/svgalib/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -123,7 +123,7 @@ override TARGET_UNITS+=svgalib vgamouse
 override TARGET_EXAMPLES+=testvga vgatest
 override INSTALL_FPCPACKAGE=y
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -206,9 +206,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -712,6 +712,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
+.PHONY: fpc_distinstall
 fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR

packages/syslog/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -123,7 +123,7 @@ override TARGET_UNITS+=systemlog
 override TARGET_EXAMPLES+=testlog
 override INSTALL_FPCPACKAGE=y
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -206,9 +206,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -712,6 +712,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
+.PHONY: fpc_distinstall
 fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR

packages/uncgi/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -123,7 +123,7 @@ override TARGET_UNITS+=uncgi
 override TARGET_EXAMPLES+=testcgi
 override INSTALL_FPCPACKAGE=y
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -206,9 +206,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -697,6 +697,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
+.PHONY: fpc_distinstall
 fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR

packages/unzip/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -125,7 +125,7 @@ override TARGET_UNITS+=unzipdll
 endif
 override INSTALL_FPCPACKAGE=y
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -208,9 +208,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -684,6 +684,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
+.PHONY: fpc_distinstall
 fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR

packages/utmp/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -123,7 +123,7 @@ override TARGET_UNITS+=utmp
 override TARGET_EXAMPLES+=testutmp
 override INSTALL_FPCPACKAGE=y
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -206,9 +206,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -697,6 +697,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
+.PHONY: fpc_distinstall
 fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR

packages/x11/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -122,7 +122,7 @@ override PACKAGE_VERSION=1.0.5
 override TARGET_UNITS+=x xlib xutil xresource xcms xshm xrender
 override INSTALL_FPCPACKAGE=y
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -205,9 +205,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -696,6 +696,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
+.PHONY: fpc_distinstall
 fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR

packages/zlib/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -122,7 +122,7 @@ override PACKAGE_VERSION=1.0.5
 override TARGET_UNITS+=zlib
 override INSTALL_FPCPACKAGE=y
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -205,9 +205,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -696,6 +696,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
+.PHONY: fpc_distinstall
 fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR

rtl/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/28]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -123,7 +123,7 @@ override DEFAULT_DIR=$(OS_TARGET)
 override TARGET_DIRS+=linux win32 go32v2 go32v1 os2 freebsd
 override INSTALL_FPCPACKAGE=y
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -206,9 +206,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -631,6 +631,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
+.PHONY: fpc_distinstall
 fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR

rtl/freebsd/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -148,7 +148,7 @@ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC)
 override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC)
 override COMPILER_TARGETDIR+=.
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -231,9 +231,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -683,7 +683,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -812,7 +811,7 @@ shared: fpc_shared
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
+distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall:

rtl/go32v1/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -133,7 +133,7 @@ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
 override COMPILER_SOURCEDIR+=$(INC) $(PROCINC)
 override COMPILER_TARGETDIR+=.
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -216,9 +216,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -664,7 +664,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -793,7 +792,7 @@ shared: fpc_shared
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
+distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall:

rtl/go32v2/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/28]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -140,7 +140,7 @@ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
 override COMPILER_SOURCEDIR+=$(INC) $(PROCINC)
 override COMPILER_TARGETDIR+=.
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -223,9 +223,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -675,7 +675,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -804,7 +803,7 @@ shared: fpc_shared
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
+distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall:

rtl/linux/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -149,7 +149,7 @@ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC)
 override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC)
 override COMPILER_TARGETDIR+=.
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -232,9 +232,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -684,7 +684,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -813,7 +812,7 @@ shared: fpc_shared
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
+distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall:

rtl/os2/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -139,7 +139,7 @@ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
 override COMPILER_SOURCEDIR+=$(INC) $(PROCINC)
 override COMPILER_TARGETDIR+=.
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -222,9 +222,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -674,7 +674,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -803,7 +802,7 @@ shared: fpc_shared
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
+distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall:

rtl/win32/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/28]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -144,7 +144,7 @@ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
 override COMPILER_SOURCEDIR+=$(INC) $(PROCINC)
 override COMPILER_TARGETDIR+=.
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -227,9 +227,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -679,7 +679,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -808,7 +807,7 @@ shared: fpc_shared
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
+distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall:

tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: allexectests
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -119,7 +119,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override INSTALL_FPCPACKAGE=y
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -202,9 +202,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -627,7 +627,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -755,7 +754,7 @@ shared: fpc_shared
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
+distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall:

tests/units/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -120,7 +120,7 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override TARGET_UNITS+=erroru
 override INSTALL_FPCPACKAGE=y
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -203,9 +203,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -679,7 +679,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -808,7 +807,7 @@ shared: fpc_shared
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
+distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall:

utils/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -124,7 +124,7 @@ override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32
 override CLEAN_UNITS+=ptopu
 override INSTALL_FPCPACKAGE=y
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -207,9 +207,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -852,6 +852,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
+.PHONY: fpc_distinstall
 fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR
@@ -1212,7 +1213,7 @@ shared: fpc_shared $(addsuffix _shared,$(TARGET_DIRS))
 install: fpc_install $(addsuffix _install,$(TARGET_DIRS))
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall $(addsuffix _exampleinstall,$(TARGET_DIRS))
-distinstall: fpc_distinstall $(addsuffix _distinstall,$(TARGET_DIRS))
+distinstall: fpc_distinstall
 zipinstall: fpc_zipinstall
 zipsourceinstall: fpc_zipsourceinstall
 zipexampleinstall: fpc_zipexampleinstall $(addsuffix _zipexampleinstall,$(TARGET_DIRS))

utils/fpcm/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -122,7 +122,7 @@ override TARGET_RSTS+=fpcmmain
 override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr
 override INSTALL_FPCPACKAGE=y
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -205,9 +205,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -854,7 +854,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -992,7 +991,7 @@ shared: fpc_shared
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
+distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall:

utils/fpcm/fpcmake.inc

@@ -190,9 +190,10 @@ const fpcmakeini : array[0..125,1..240] of char=(
   #010+
   '# echo'#010+
   'ifndef ECHO'#010+
-  'ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))'#010+
+  'ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))'+
+  '))'#010+
   'ifeq ($(ECHO),)'#010+
-  'ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPAT','H)'+
+  'ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCH','PATH)'+
   ')))'#010+
   'ifeq ($(ECHO),)'#010+
   'ECHO:=echo'#010+
@@ -214,7 +215,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   'COPYTREE:=cp -rfp'#010+
   'endif'#010+
   #010+
-  '# To move pog','rams'#010+
+  '# To move ','pograms'#010+
   'ifndef MOVE'#010+
   'MOVE:=mv -f'#010+
   'endif'#010+
@@ -234,7 +235,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   'ifdef inUnix'#010+
   'INSTALL:=install -c -m 644'#010+
   'else'#010+
-  'INSTALL:=$(','COPY)'#010+
+  'INSTALL:','=$(COPY)'#010+
   'endif'#010+
   'endif'#010+
   #010+
@@ -252,7 +253,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   'ifdef inUnix'#010+
   'MKDIR:=install -m 755 -d'#010+
   'else'#010+
-  'MKDIR:=ginstall -m 75','5 -d'#010+
+  'MKDIR:=ginstall -m',' 755 -d'#010+
   'endif'#010+
   'endif'#010+
   #010+
@@ -262,7 +263,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   '[defaulttools]'#010+
   '#####################################################################'#010+
   '# Default Tools'#010+
-  '###################################################','#################'+
+  '################################################','####################'+
   '#'#010+
   #010+
   '# assembler, redefine it if cross compiling'#010+
@@ -283,7 +284,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   '# ppas.bat / ppas.sh'#010+
   'PPAS=ppas$(BATCHEXT)'#010+
   #010+
-  '# ldconfig t','o rebuild .so cache'#010+
+  '# ldconfi','g to rebuild .so cache'#010+
   'ifdef inUnix'#010+
   'LDCONFIG=ldconfig'#010+
   'else'#010+
@@ -297,7 +298,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   'ifeq ($(PPUMOVE),)'#010+
   'PPUMOVE='#010+
   'else'#010+
-  'PPUMOVE:=$(firstword $(PPUMOVE)',')'#010+
+  'PPUMOVE:=$(firstword $(PPUMO','VE))'#010+
   'endif'#010+
   'endif'#010+
   'export PPUMOVE'#010+
@@ -314,18 +315,18 @@ const fpcmakeini : array[0..125,1..240] of char=(
   'endif'#010+
   'export PPUFILES'#010+
   #010+
-  '# gd','ate/date'#010+
+  '#',' gdate/date'#010+
   'ifndef DATE'#010+
-  'DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH)))'+
-  ')'#010+
+  'DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))'+
+  '))'#010+
   'ifeq ($(DATE),)'#010+
-  'DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH)))'+
+  'DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH)))'+
   ')'#010+
   'ifeq ($(DATE),)'#010+
   'DATE='#010+
   'else'#010+
   'DATE:=$(firstword $(DATE))'#010+
-  'endif',#010+
+  'e','ndif'#010+
   'else'#010+
   'DATE:=$(firstword $(DATE))'#010+
   'endif'#010+
@@ -341,7 +342,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   '# Look if UPX is found for go32v2 and win32. We can'#039't use $UPX bec'+
   'uase'#010+
   '# upx uses that one itself (PFV)'#010+
-  'ifndef UPXPR','OG'#010+
+  'ifndef U','PXPROG'#010+
   'ifeq ($(OS_TARGET),go32v2)'#010+
   'UPXPROG:=1'#010+
   'endif'#010+
@@ -354,7 +355,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   'ifeq ($(UPXPROG),)'#010+
   'UPXPROG='#010+
   'else'#010+
-  'UPXPROG:=$(firstword $(UPXPRO','G))'#010+
+  'UPXPROG:=$(firstword $(UP','XPROG))'#010+
   'endif'#010+
   'else'#010+
   'UPXPROG='#010+
@@ -369,7 +370,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   'ifeq ($(ZIPPROG),)'#010+
   'ZIPPROG='#010+
   'else'#010+
-  'ZIPPROG:=$(firs','tword $(ZIPPROG))'#010+
+  'ZIPPROG:=$(','firstword $(ZIPPROG))'#010+
   'endif'#010+
   'endif'#010+
   'export ZIPPROG'#010+
@@ -385,8 +386,8 @@ const fpcmakeini : array[0..125,1..240] of char=(
   'TARPROG='#010+
   'else'#010+
   'TARPROG:=$(firstword $(TARPROG))'#010+
+  'endif'#010,
   'endif'#010+
-  'endi','f'#010+
   'export TARPROG'#010+
   #010+
   'ifeq ($(USETAR),bz2)'#010+
@@ -401,7 +402,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   '[extensions]'#010+
   '#####################################################################'#010+
   '# Default extensions'#010+
-  '#################################','###################################'+
+  '#############################','#######################################'+
   '#'#010+
   #010+
   '# Default needed extensions (Go32v2,Linux)'#010+
@@ -416,10 +417,10 @@ const fpcmakeini : array[0..125,1..240] of char=(
   'SHAREDLIBEXT=.so'#010+
   'LIBPREFIX=lib'#010+
   'RSTEXT=.rst'#010+
-  'FPCMADE=fpcmade'#010+
+  'FPCMADE=fpcmade',#010+
   #010+
   #010+
-  '#',' Go32v1'#010+
+  '# Go32v1'#010+
   'ifeq ($(OS_TARGET),go32v1)'#010+
   'PPUEXT=.pp1'#010+
   'OEXT=.o1'#010+
@@ -435,8 +436,8 @@ const fpcmakeini : array[0..125,1..240] of char=(
   '# Go32v2'#010+
   'ifeq ($(OS_TARGET),go32v2)'#010+
   'LIBPREFIX='#010+
-  'FPCMADE=fpcmade.dos'#010+
-  'ZIP','SUFFIX=go32'#010+
+  'FPCMADE=fpcmade.dos',#010+
+  'ZIPSUFFIX=go32'#010+
   'endif'#010+
   #010+
   '# Linux'#010+
@@ -456,7 +457,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   'endif'#010+
   #010+
   '# Win32'#010+
-  'ifeq ','($(OS_TARGET),win32)'#010+
+  'i','feq ($(OS_TARGET),win32)'#010+
   'PPUEXT=.ppw'#010+
   'OEXT=.ow'#010+
   'ASMEXT=.sw'#010+
@@ -474,7 +475,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   'OEXT=.oo2'#010+
   'AOUTEXT=.out'#010+
   'SMARTEXT=.so'#010+
-  'STATIC','LIBEXT=.ao2'#010+
+  'ST','ATICLIBEXT=.ao2'#010+
   'SHAREDLIBEXT=.dll'#010+
   'FPCMADE=fpcmade.os2'#010+
   'ZIPSUFFIX=emx'#010+
@@ -483,7 +484,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   '[defaultdirs]'#010+
   '#####################################################################'#010+
   '# Default Directories'#010+
-  '###############################################################','#####'+
+  '###########################################################','#########'+
   '#'#010+
   #010+
   '# Units dir'#010+
@@ -497,8 +498,8 @@ const fpcmakeini : array[0..125,1..240] of char=(
   'endif'#010+
   #010+
   #010+
-  '# Linux and freebsd use unix dirs with /usr/bin, /usr/lib'#010+
-  '# ','When zipping use the target as default, when normal install then'#010+
+  '# Linux and freebsd use unix dirs with /usr/bin, /usr/li','b'#010+
+  '# When zipping use the target as default, when normal install then'#010+
   '# use the source os as default'#010+
   'ifdef ZIPINSTALL'#010+
   '# Zipinstall'#010+
@@ -509,7 +510,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   'UNIXINSTALLDIR=1'#010+
   'endif'#010+
   'else'#010+
-  '# Normal ','install'#010+
+  '# Nor','mal install'#010+
   'ifeq ($(OS_SOURCE),linux)'#010+
   'UNIXINSTALLDIR=1'#010+
   'endif'#010+
@@ -521,8 +522,8 @@ const fpcmakeini : array[0..125,1..240] of char=(
   '# set the prefix directory where to install everything'#010+
   'ifndef INSTALL_PREFIX'#010+
   'ifdef UNIXINSTALLDIR'#010+
-  'INSTALL_PREFIX=/usr/local'#010+
-  'e','lse'#010+
+  'INSTALL_PREFIX=/usr/loc','al'#010+
+  'else'#010+
   'ifdef INSTALL_FPCPACKAGE'#010+
   'INSTALL_BASEDIR:=/pp'#010+
   'else'#010+
@@ -536,7 +537,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   'ifndef DIST_DESTDIR'#010+
   'DIST_DESTDIR:=$(BASEDIR)'#010+
   'endif'#010+
-  'export DIST_DESTDI','R'#010+
+  'export DIST_DE','STDIR'#010+
   #010+
   #010+
   '#####################################################################'#010+
@@ -544,7 +545,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   '#####################################################################'#010+
   #010+
   '# set the base directory where to install everything'#010+
-  'ifndef INSTALL_BASED','IR'#010+
+  'ifndef INSTALL_B','ASEDIR'#010+
   'ifdef UNIXINSTALLDIR'#010+
   'ifdef INSTALL_FPCPACKAGE'#010+
   'INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)'#010+
@@ -556,14 +557,14 @@ const fpcmakeini : array[0..125,1..240] of char=(
   'endif'#010+
   'endif'#010+
   #010+
-  '# set the dire','ctory where to install the binaries'#010+
+  '# set the ','directory where to install the binaries'#010+
   'ifndef INSTALL_BINDIR'#010+
   'ifdef UNIXINSTALLDIR'#010+
   'INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin'#010+
   'else'#010+
   'INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin'#010+
   '# for FPC packages install the binaries under their os target subdir'#010+
-  'ifdef INST','ALL_FPCPACKAGE'#010+
+  'ifdef ','INSTALL_FPCPACKAGE'#010+
   'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)'#010+
   'endif'#010+
   'endif'#010+
@@ -573,7 +574,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   'ifndef INSTALL_UNITDIR'#010+
   'INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)'#010+
   'ifdef INSTALL_FPCPACKAGE'#010+
-  'INSTALL_','UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)'#010+
+  'INST','ALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)'#010+
   'endif'#010+
   'endif'#010+
   #010+
@@ -586,14 +587,14 @@ const fpcmakeini : array[0..125,1..240] of char=(
   'endif'#010+
   'endif'#010+
   #010+
-  '# Where the s','ource files will be stored'#010+
+  '# Where t','he source files will be stored'#010+
   'ifndef INSTALL_SOURCEDIR'#010+
   'ifdef UNIXINSTALLDIR'#010+
   'ifdef INSTALL_FPCPACKAGE'#010+
   'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_'+
   'NAME)'#010+
   'else'#010+
-  'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PA','CKAGE_V'+
+  'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-','$(PACKAGE_V'+
   'ERSION)'#010+
   'endif'#010+
   'else'#010+
@@ -606,7 +607,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   'endif'#010+
   #010+
   '# Where the doc files will be stored'#010+
-  'ifndef INSTALL_DOCDIR',#010+
+  'ifndef INSTALL_DO','CDIR'#010+
   'ifdef UNIXINSTALLDIR'#010+
   'ifdef INSTALL_FPCPACKAGE'#010+
   'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAM'+
@@ -617,7 +618,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   'endif'#010+
   'else'#010+
   'ifdef INSTALL_FPCPACKAGE'#010+
-  'INSTAL','L_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)'#010+
+  'IN','STALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)'#010+
   'else'#010+
   'INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc'#010+
   'endif'#010+
@@ -626,7 +627,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   #010+
   '# Where to install the examples, under linux we use the doc dir'#010+
   '# because the copytree command will create a subdir itself'#010+
-  'ifnde','f INSTALL_EXAMPLEDIR'#010+
+  'i','fndef INSTALL_EXAMPLEDIR'#010+
   'ifdef UNIXINSTALLDIR'#010+
   'ifdef INSTALL_FPCPACKAGE'#010+
   'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/'+
@@ -634,7 +635,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   'else'#010+
   'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VE'+
   'RSION)'#010+
-  'endif',#010+
+  'e','ndif'#010+
   'else'#010+
   'ifdef INSTALL_FPCPACKAGE'#010+
   'INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)'#010+
@@ -645,7 +646,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   'endif'#010+
   #010+
   '# Where the some extra (data)files will be stored'#010+
-  'ifndef INSTALL_DATADIR'#010,
+  'ifndef INSTALL_DATA','DIR'#010+
   'INSTALL_DATADIR=$(INSTALL_BASEDIR)'#010+
   'endif'#010+
   #010+
@@ -658,7 +659,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   ' $$4 } '#039'`)'#010+
   'endif'#010+
   'ifndef OTHERLIBDIR'#010+
-  'OTHERLIBDIR:','=$(shell grep -v "^\#" /etc/ld.so.conf | awk '#039'{ ORS='+
+  'OTHERLIB','DIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '#039'{ ORS='+
   '" "; print $1 }'#039')'#010+
   'endif'#010+
   'export GCCLIBDIR OTHERLIB'#010+
@@ -668,7 +669,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   '[command_begin]'#010+
   '#####################################################################'#010+
   '# Compiler Command Line'#010+
-  '####################','################################################'+
+  '################','####################################################'+
   '#'#010+
   #010+
   '# Load commandline OPTDEF and add FPC_CPU define'#010+
@@ -676,7 +677,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   #010+
   '# Load commandline OPT and add target and unit dir to be sure'#010+
   'ifneq ($(OS_TARGET),$(OS_SOURCE))'#010+
-  'override F','PCOPT+=-T$(OS_TARGET)'#010+
+  'overri','de FPCOPT+=-T$(OS_TARGET)'#010+
   'endif'#010+
   #010+
   '# User dirs should be first, so they are looked at first'#010+
@@ -687,7 +688,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   'override FPCOPT+=$(addprefix -Fl,$(LIBDIR))'#010+
   'endif'#010+
   'ifdef OBJDIR'#010+
-  'override FPCO','PT+=$(addprefix -Fo,$(OBJDIR))'#010+
+  'override ','FPCOPT+=$(addprefix -Fo,$(OBJDIR))'#010+
   'endif'#010+
   'ifdef INCDIR'#010+
   'override FPCOPT+=$(addprefix -Fi,$(INCDIR))'#010+
@@ -703,8 +704,8 @@ const fpcmakeini : array[0..125,1..240] of char=(
   'override FPCOPT+=-CX'#010+
   'endif'#010+
   #010+
-  '# Debug'#010+
-  'if','def DEBUG'#010+
+  '# Debu','g'#010+
+  'ifdef DEBUG'#010+
   'override FPCOPT+=-gl'#010+
   'override FPCOPTDEF+=DEBUG'#010+
   'endif'#010+
@@ -717,7 +718,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   #010+
   '# Strip'#010+
   'ifdef STRIP'#010+
-  'override FPCOPT+=','-Xs'#010+
+  'override FPCO','PT+=-Xs'#010+
   'endif'#010+
   #010+
   '# Optimizer'#010+
@@ -732,8 +733,8 @@ const fpcmakeini : array[0..125,1..240] of char=(
   #010+
   '# Needed compiler options'#010+
   'ifdef COMPILER_OPTIONS'#010+
-  'override FPCOPT+=$(COMPILER_OPTIONS)'#010+
-  'en','dif'#010+
+  'override FPCOPT+=$(COMPILER_OPTIONS',')'#010+
+  'endif'#010+
   'ifdef COMPILER_UNITDIR'#010+
   'override FPCOPT+=$(addprefix -Fu,$(COMPILER_UNITDIR))'#010+
   'endif'#010+
@@ -741,7 +742,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   'override FPCOPT+=$(addprefix -Fl,$(COMPILER_LIBRARYDIR))'#010+
   'endif'#010+
   'ifdef COMPILER_OBJECTDIR'#010+
-  'override FPCOPT+=$(addprefix -Fo,$(COMP','ILER_OBJECTDIR))'#010+
+  'override FPCOPT+=$(addprefix -Fo,$(','COMPILER_OBJECTDIR))'#010+
   'endif'#010+
   'ifdef COMPILER_INCLUDEDIR'#010+
   'override FPCOPT+=$(addprefix -Fi,$(COMPILER_INCLUDEDIR))'#010+
@@ -750,7 +751,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   '# Target dirs and the prefix to use for clean/install'#010+
   'ifdef COMPILER_TARGETDIR'#010+
   'override FPCOPT+=-FE$(COMPILER_TARGETDIR)'#010+
-  'ifeq (','$(COMPILER_TARGETDIR),.)'#010+
+  'if','eq ($(COMPILER_TARGETDIR),.)'#010+
   'override TARGETDIRPREFIX='#010+
   'else'#010+
   'override TARGETDIRPREFIX=$(COMPILER_TARGETDIR)/'#010+
@@ -760,7 +761,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   '# Unit target dir'#010+
   'ifdef COMPILER_UNITTARGETDIR'#010+
   'override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)'#010+
-  'ifeq ($(COMPILER_UNITTARGETDIR','),.)'#010+
+  'ifeq ($(COMPILER_UNITTARGE','TDIR),.)'#010+
   'override UNITTARGETDIRPREFIX='#010+
   'else'#010+
   'override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/'#010+
@@ -769,8 +770,8 @@ const fpcmakeini : array[0..125,1..240] of char=(
   'ifdef COMPILER_TARGETDIR'#010+
   'override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)'#010+
   'override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)'#010+
+  'endif'#010,
   'endif'#010+
-  'endi','f'#010+
   #010+
   '[command_libc]'#010+
   '# Add GCC lib path if asked'#010+
@@ -783,7 +784,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   #010+
   #010+
   '[command_end]'#010+
-  '# Add commandline options last so they can overrid','e'#010+
+  '# Add commandline options last so they can ove','rride'#010+
   'ifdef OPT'#010+
   'override FPCOPT+=$(OPT)'#010+
   'endif'#010+
@@ -798,7 +799,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   'override FPCOPT+=@$(CFGFILE)'#010+
   'endif'#010+
   #010+
-  '# For w','in32 the options are passed using the environment FPCEXTCMD'#010+
+  '# F','or win32 the options are passed using the environment FPCEXTCMD'#010+
   '# to prevent to long commandlines'#010+
   'ifeq ($(OS_SOURCE),win32)'#010+
   'USEENV=1'#010+
@@ -810,7 +811,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   'export FPCEXTCMD'#010+
   'endif'#010+
   #010+
-  '# Compile','r commandline'#010+
+  '# Com','piler commandline'#010+
   'override COMPILER:=$(FPC) $(FPCOPT)'#010+
   #010+
   '# also call ppas if with command option -s'#010+
@@ -819,7 +820,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   'EXECPPAS='#010+
   'else'#010+
   'ifeq ($(OS_SOURCE),$(OS_TARGET))'#010+
-  'EXECPPAS',':=@$(PPAS)'#010+
+  'EXEC','PPAS:=@$(PPAS)'#010+
   'endif'#010+
   'endif'#010+
   #010+
@@ -832,7 +833,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   '.PHONY: fpc_loaders'#010+
   #010+
   'ifdef TARGET_LOADERS'#010+
-  'override',' ALLTARGET+=fpc_loaders'#010+
+  'over','ride ALLTARGET+=fpc_loaders'#010+
   'override CLEANTARGET+=fpc_loaders_clean'#010+
   'override INSTALLTARGET+=fpc_loaders_install'#010+
   #010+
@@ -842,7 +843,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   '%$(OEXT): %$(LOADEREXT)'#010+
   '        $(AS) -o $*$(OEXT) $<'#010+
   #010+
-  'fpc_loa','ders: $(LOADEROFILES)'#010+
+  'fpc','_loaders: $(LOADEROFILES)'#010+
   #010+
   'fpc_loaders_clean:'#010+
   '        -$(DEL) $(LOADEROFILES)'#010+
@@ -853,7 +854,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   #010+
   #010+
   '[unitrules]'#010+
-  '########################################','############################'+
+  '####################################','################################'+
   '#'#010+
   '# Units'#010+
   '#####################################################################'#010+
@@ -863,8 +864,8 @@ const fpcmakeini : array[0..125,1..240] of char=(
   'ifdef TARGET_UNITS'#010+
   'override ALLTARGET+=fpc_units'#010+
   #010+
-  'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))'#010+
-  'o','verride INSTALLPPUFILES+=$(UNITPPUFILES)'#010+
+  'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS','))'#010+
+  'override INSTALLPPUFILES+=$(UNITPPUFILES)'#010+
   'override CLEANPPUFILES+=$(UNITPPUFILES)'#010+
   'endif'#010+
   #010+
@@ -874,7 +875,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   '[exerules]'#010+
   '#####################################################################'#010+
   '# Exes'#010+
-  '###################################','#################################'+
+  '###############################','#####################################'+
   '#'#010+
   #010+
   '.PHONY: fpc_exes'#010+
@@ -882,14 +883,14 @@ const fpcmakeini : array[0..125,1..240] of char=(
   'ifdef TARGET_PROGRAMS'#010+
   'override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))'#010+
   'override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefi'+
-  'x $(LIBPREFIX),$(addsuffix $(STATI','CLIBEXT),$(TARGET_PROGRAMS)))'#010+
+  'x $(LIBPREFIX),$(addsuffix $(S','TATICLIBEXT),$(TARGET_PROGRAMS)))'#010+
   #010+
   'override ALLTARGET+=fpc_exes'#010+
   'override INSTALLEXEFILES+=$(EXEFILES)'#010+
   'override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+
   'ifeq ($(OS_TARGET),os2)'#010+
-  'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+
-  'en','dif'#010+
+  'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS)',')'#010+
+  'endif'#010+
   'endif'#010+
   #010+
   'fpc_exes: $(EXEFILES)'#010+
@@ -901,7 +902,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   '#####################################################################'#010+
   #010+
   'ifdef TARGET_RSTS'#010+
-  'override RSTFILE','S=$(addsuffix $(RSTEXT),$(TARGET_RSTS))'#010+
+  'override RST','FILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))'#010+
   #010+
   'override CLEANRSTFILES+=$(RSTFILES)'#010+
   'endif'#010+
@@ -910,7 +911,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   '[examplerules]'#010+
   '#####################################################################'#010+
   '# Examples'#010+
-  '###########################################################','#########'+
+  '#######################################################','#############'+
   '#'#010+
   #010+
   '.PHONY: fpc_examples fpc_test'#010+
@@ -919,13 +920,13 @@ const fpcmakeini : array[0..125,1..240] of char=(
   'HASEXAMPLES=1'#010+
   'override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMP'+
   'LES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))'#010+
-  'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(','TARGET_EXAMPLES))'#010+
+  'override EXAMPLEFILES:=$(addsuffix $(EXEEXT','),$(TARGET_EXAMPLES))'#010+
   'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addp'+
   'refix $(LIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES)))'#010+
   #010+
   'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+
-  'ifeq ($(OS_TARGET),os2)'#010+
-  'ov','erride CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+
+  'ifeq ($(OS_TARGET),os2',')'#010+
+  'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+
   'endif'#010+
   'endif'#010+
   'ifdef TARGET_EXAMPLEDIRS'#010+
@@ -937,7 +938,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   #010+
   #010+
   '[compilerules]'#010+
-  '##########################','##########################################'+
+  '######################','##############################################'+
   '#'#010+
   '# General compile rules'#010+
   '#####################################################################'#010+
@@ -945,7 +946,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   '.PHONY: fpc_packages fpc_all fpc_smart fpc_debug'#010+
   #010+
   '$(FPCMADE): $(ALLTARGET)'#010+
-  '        @$(ECHO) Compiled ','> $(FPCMADE)'#010+
+  '        @$(ECHO) Compi','led > $(FPCMADE)'#010+
   #010+
   'fpc_packages: $(COMPILEPACKAGES)'#010+
   #010+
@@ -957,7 +958,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   'fpc_debug:'#010+
   '        $(MAKE) all DEBUG=1'#010+
   #010+
-  '# General compile rules, available for both possible .pp and',' .pas ex'+
+  '# General compile rules, available for both possible .pp',' and .pas ex'+
   'tensions'#010+
   #010+
   '.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .pp'#010+
@@ -972,7 +973,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   #010+
   '%$(EXEEXT): %.pp'#010+
   '        $(COMPILER) $<'#010+
-  '        $(','EXECPPAS)'#010+
+  '      ','  $(EXECPPAS)'#010+
   #010+
   '%$(EXEEXT): %.pas'#010+
   '        $(COMPILER) $<'#010+
@@ -981,7 +982,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   '# Search paths for .ppu and .pp and .pas'#010+
   'vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
   'vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
-  'vpath %$(PPUE','XT) $(COMPILER_UNITTARGETDIR)'#010+
+  'vpath %$(','PPUEXT) $(COMPILER_UNITTARGETDIR)'#010+
   #010+
   #010+
   '[libraryrules]'#010+
@@ -991,8 +992,8 @@ const fpcmakeini : array[0..125,1..240] of char=(
   #010+
   '.PHONY: fpc_shared'#010+
   #010+
-  'ifndef LIB_FULLNAME'#010+
-  'if','def LIB_VERSION'#010+
+  'ifndef LIB_FULLNAM','E'#010+
+  'ifdef LIB_VERSION'#010+
   'LIB_FULLNAME=$(LIB_NAME).$(LIB_VERSION)'#010+
   'else'#010+
   'LIB_FULLNAME=$(LIB_NAME)'#010+
@@ -1005,7 +1006,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   'endif'#010+
   #010+
   'fpc_shared: all'#010+
-  'ifdef HASSHARED','LIB'#010+
+  'ifdef HASSH','AREDLIB'#010+
   '        $(PPUMOVE) $(LIB_SHAREDUNITS) -o$(LIB_FULLNAME)'#010+
   'else'#010+
   '        @$(ECHO) Shared Libraries not supported'#010+
@@ -1015,7 +1016,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   '[installrules]'#010+
   '#####################################################################'#010+
   '# Install rules'#010+
-  '##################','##################################################'+
+  '##############','######################################################'+
   '#'#010+
   #010+
   '.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall'#010+
@@ -1025,18 +1026,18 @@ const fpcmakeini : array[0..125,1..240] of char=(
   'endif'#010+
   #010+
   'ifdef INSTALLPPUFILES'#010+
-  'ifdef PPUFILES',#010+
+  'ifdef PPUF','ILES'#010+
   'override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALL'+
   'PPUFILES))'#010+
   'override INSTALLPPULINKFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(she'+
   'll $(PPUFILES) -S -O $(INSTALLPPUFILES)))'#010+
   'else'#010+
-  'override INSTALLPPULINKFILES:=$(subst $(P','PUEXT),$(OEXT),$(INSTALLPPU'+
+  'override INSTALLPPULINKFILES:=$(subst',' $(PPUEXT),$(OEXT),$(INSTALLPPU'+
   'FILES)) $(addprefix $(LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(I'+
   'NSTALLPPUFILES)))'#010+
   'override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALL'+
   'PPUFILES))'#010+
-  'override INSTALLPPULINKFILES:=$(wildcard $(a','ddprefix $(UNITTARGETDIR'+
+  'override INSTALLPPULINKFILES:=$(wildcard',' $(addprefix $(UNITTARGETDIR'+
   'PREFIX),$(INSTALLPPULINKFILES)))'#010+
   'endif'#010+
   'endif'#010+
@@ -1049,7 +1050,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   #010+
   'fpc_install: $(INSTALLTARGET)'#010+
   '# Create UnitInstallFiles'#010+
-  'ifdef I','NSTALLEXEFILES'#010+
+  'ifd','ef INSTALLEXEFILES'#010+
   '        $(MKDIR) $(INSTALL_BINDIR)'#010+
   '# Compress the exes if upx is defined'#010+
   'ifdef UPXPROG'#010+
@@ -1058,13 +1059,13 @@ const fpcmakeini : array[0..125,1..240] of char=(
   '        $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)'#010+
   'endif'#010+
   'ifdef INSTALLPPUFILES'#010+
-  '      ','  $(MKDIR) $(INSTALL_UNITDIR)'#010+
+  '  ','      $(MKDIR) $(INSTALL_UNITDIR)'#010+
   '        $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+
   'ifneq ($(INSTALLPPULINKFILES),)'#010+
   '        $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+
   'endif'#010+
   'ifneq ($(wildcard $(LIB_FULLNAME)),)'#010+
-  '        $(MKDIR) ','$(INSTALL_LIBDIR)'#010+
+  '        $(MKD','IR) $(INSTALL_LIBDIR)'#010+
   '        $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+
   'ifdef inUnix'#010+
   '        ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#010+
@@ -1073,7 +1074,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   'endif'#010+
   'ifdef INSTALL_FILES'#010+
   '        $(MKDIR) $(INSTALL_DATADIR)'#010+
-  '        $(INSTALL) $(','INSTALL_FILES) $(INSTALL_DATADIR)'#010+
+  '        $(INSTALL',') $(INSTALL_FILES) $(INSTALL_DATADIR)'#010+
   'endif'#010+
   #010+
   'fpc_sourceinstall: distclean'#010+
@@ -1081,18 +1082,25 @@ const fpcmakeini : array[0..125,1..240] of char=(
   '        $(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)'#010+
   #010+
   'fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))'#010+
-  'ifdef HASEXAM','PLES'#010+
+  'ifdef HAS','EXAMPLES'#010+
   '        $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+
   'endif'#010+
   'ifdef EXAMPLESOURCEFILES'#010+
   '        $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+
   'endif'#010+
   'ifdef TARGET_EXAMPLEDIRS'#010+
-  '        $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EX'+
-  'AMPL','EDIR)'#010+
+  '        $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EX',
+  'AMPLEDIR)'#010+
   'endif'#010+
   #010+
-  'fpc_distinstall: install exampleinstall'#010+
+  '[distinstallrules]'#010+
+  '#####################################################################'#010+
+  '# Dist Install'#010+
+  '#####################################################################'#010+
+  #010+
+  '.PHONY: fpc_distinstall'#010+
+  #010+
+  'fpc_distinstall: instal','l exampleinstall'#010+
   #010+
   #010+
   '[zipinstallrules]'#010+
@@ -1100,7 +1108,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   '# Zip'#010+
   '#####################################################################'#010+
   #010+
-  '.PHONY: fpc_zipinsta','ll fpc_zipsourceinstall fpc_zipexampleinstall'#010+
+  '.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexamp','leinstall'#010+
   #010+
   '# Temporary path to pack a file, can only use a single deep'#010+
   '# subdir, because the deltree can'#039't see the whole tree to remove'#010+
@@ -1108,11 +1116,11 @@ const fpcmakeini : array[0..125,1..240] of char=(
   'ifndef inUnix'#010+
   'PACKDIR=$(BASEDIR)/../fpc-pack'#010+
   'else'#010+
-  'PAC','KDIR=/tmp/fpc-pack'#010+
+  'PACKDIR=/tmp/fpc-pack'#010+
   'endif'#010+
   'endif'#010+
   #010+
-  '# Maybe create default zipname from packagename'#010+
+  '# Ma','ybe create default zipname from packagename'#010+
   'ifndef ZIPNAME'#010+
   'ifdef DIST_ZIPNAME'#010+
   'ZIPNAME=$(DIST_ZIPNAME)'#010+
@@ -1123,8 +1131,8 @@ const fpcmakeini : array[0..125,1..240] of char=(
   #010+
   '# ZipTarget'#010+
   'ifndef ZIPTARGET'#010+
-  'ifdef D','IST_ZIPTARGET'#010+
-  'ZIPTARGET=DIST_ZIPTARGET'#010+
+  'ifdef DIST_ZIPTARGET'#010+
+  'ZIPTARGET=DIST_ZIPTARG','ET'#010+
   'else'#010+
   'ZIPTARGET=install'#010+
   'endif'#010+
@@ -1142,13 +1150,13 @@ const fpcmakeini : array[0..125,1..240] of char=(
   'USEZIPWRAPPER=1'#010+
   'endif'#010+
   #010+
-  '# Cre','ate commands to create the zip/tar file'#010+
+  '# Create commands to create the zip/tar f','ile'#010+
   'ZIPWRAPPER=$(DIST_DESTDIR)/fpczip$(BATCHEXT)'#010+
   'ZIPCMD_CDPACK:=cd $(subst /,$(PATHSEP),$(PACKDIR))'#010+
   'ZIPCMD_CDBASE:=cd $(subst /,$(PATHSEP),$(BASEDIR))'#010+
   'ifdef USETAR'#010+
-  'ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$','(TAREXT)'#010+
-  'ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *'#010+
+  'ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)'#010+
+  'ZIPCMD_ZIP:=$(TARPROG) cf$(','TAROPT) $(ZIPDESTFILE) *'#010+
   'else'#010+
   'ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)'#010+
   'ZIPCMD_ZIP:=$(subst /,$(PATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFI'+
@@ -1156,34 +1164,34 @@ const fpcmakeini : array[0..125,1..240] of char=(
   'endif'#010+
   #010+
   'fpc_zipinstall:'#010+
-  '        $(MAKE) $(ZIPTARGE','T) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+
+  '        $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINST','ALL=1'#010+
   '        $(DEL) $(ZIPDESTFILE)'#010+
   'ifdef USEZIPWRAPPER'#010+
   'ifneq ($(ECHO),echo)'#010+
   '        $(ECHO) "$(ZIPCMD_CDPACK)" > $(ZIPWRAPPER)'#010+
   '        $(ECHO) "$(ZIPCMD_ZIP)" >> $(ZIPWRAPPER)'#010+
-  '        $(ECHO) "$(ZIPCMD_C','DBASE)" >> $(ZIPWRAPPER)'#010+
+  '        $(ECHO) "$(ZIPCMD_CDBASE)" >> $(ZIPWRAPPER)'#010+
   'else'#010+
-  '        $(ECHO) $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)'#010+
+  '      ','  $(ECHO) $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)'#010+
   '        $(ECHO) $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#010+
   '        $(ECHO) $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+
   'endif'#010+
   'ifdef inUnix'#010+
   '        /bin/sh $(ZIPWRAPPER)'#010+
   'else'#010+
-  '        $(','ZIPWRAPPER)'#010+
+  '        $(ZIPWRAPPER)'#010+
   'endif'#010+
-  '        $(DEL) $(ZIPWRAPPER)'#010+
+  '        $(DEL) $(Z','IPWRAPPER)'#010+
   'else'#010+
   '        $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#010+
   'endif'#010+
   '        $(DELTREE) $(PACKDIR)'#010+
   #010+
   'fpc_zipsourceinstall:'#010+
-  '        $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src'#010,
+  '        $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src'#010+
   #010+
   'fpc_zipexampleinstall:'#010+
-  'ifdef HASEXAMPLES'#010+
+  'ifdef HASEXA','MPLES'#010+
   '        $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm'#010+
   'endif'#010+
   #010+
@@ -1192,35 +1200,35 @@ const fpcmakeini : array[0..125,1..240] of char=(
   #010+
   #010+
   '[cleanrules]'#010+
-  '#################################','###################################'+
-  '#'#010+
+  '#####################################################################',
+  #010+
   '# Clean rules'#010+
   '#####################################################################'#010+
   #010+
   '.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+
   #010+
   'ifdef EXEFILES'#010+
-  'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(','CLEANEXEFIL'+
-  'ES))'#010+
+  'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES'+
+  '))'#010+
   'endif'#010+
   #010+
-  'ifdef CLEAN_UNITS'#010+
+  'ifdef CLEAN_U','NITS'#010+
   'override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))'#010+
   'endif'#010+
   #010+
   'ifdef CLEANPPUFILES'#010+
   'override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUF'+
   'ILES))'#010+
-  '# Get the .o and .a files created',' for the units'#010+
+  '# Get the .o and .a files created for the units'#010+
   'ifdef PPUFILES'#010+
-  'CLEANPPULINKFILES:=$(shell $(PPUFILES) $(CLEANPPUFILES))'#010+
+  'CLEANP','PULINKFILES:=$(shell $(PPUFILES) $(CLEANPPUFILES))'#010+
   'else'#010+
   'CLEANPPULINKFILES:=$(wildcard $(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILE'+
   'S)) $(addprefix $(LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEAN'+
-  'PPUFILES','))))'#010+
+  'PPUFILES))))'#010+
   'endif'#010+
-  'override CLEANPPULINKFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEAN'+
-  'PPULINKFILES))'#010+
+  'override CLEANPPULINKFILE','S:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLE'+
+  'ANPPULINKFILES))'#010+
   'endif'#010+
   #010+
   'fpc_clean: $(CLEANTARGET)'#010+
@@ -1228,9 +1236,9 @@ const fpcmakeini : array[0..125,1..240] of char=(
   '        -$(DEL) $(CLEANEXEFILES)'#010+
   'endif'#010+
   'ifdef CLEANPPUFILES'#010+
-  '        -$(DEL) $(CLEANPPUFILES)',#010+
+  '        -$(DEL) $(CLEANPPUFILES)'#010+
   'endif'#010+
-  'ifneq ($(CLEANPPULINKFILES),)'#010+
+  'ifneq ($(CLEANPPULINKFILES),)',#010+
   '        -$(DEL) $(CLEANPPULINKFILES)'#010+
   'endif'#010+
   'ifdef CLEANRSTFILES'#010+
@@ -1239,8 +1247,8 @@ const fpcmakeini : array[0..125,1..240] of char=(
   'ifdef CLEAN_FILES'#010+
   '        -$(DEL) $(CLEAN_FILES)'#010+
   'endif'#010+
-  'ifdef LIB_','NAME'#010+
-  '        -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+
+  'ifdef LIB_NAME'#010+
+  '        -$(DEL) $(LIB_NAME) $(L','IB_FULLNAME)'#010+
   'endif'#010+
   '        -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)'+
   #010+
@@ -1248,8 +1256,8 @@ const fpcmakeini : array[0..125,1..240] of char=(
   'fpc_distclean: clean'#010+
   #010+
   '# Also run clean first if targetdir is set. Unittargetdir is always'#010+
-  '# set if targetdir or u','nittargetdir is specified'#010+
-  'ifdef COMPILER_UNITTARGETDIR'#010+
+  '# set if targetdir or unittargetdir is specified'#010+
+  'ifdef COMP','ILER_UNITTARGETDIR'#010+
   'TARGETDIRCLEAN=fpc_clean'#010+
   'endif'#010+
   #010+
@@ -1257,8 +1265,8 @@ const fpcmakeini : array[0..125,1..240] of char=(
   'ifdef CLEANEXEFILES'#010+
   '        -$(DEL) $(CLEANEXEFILES)'#010+
   'endif'#010+
-  '        -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) ','*$(ASMEXT) *$(STATICL'+
-  'IBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+
+  '        -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIB'+
+  'EXT) *$(SHARE','DLIBEXT) *$(PPLEXT)'#010+
   '        -$(DELTREE) *$(SMARTEXT)'#010+
   '        -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)'+
   #010+
@@ -1268,7 +1276,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
   #010+
   #010+
   '[inforules]'#010+
-  '##################','##################################################'+
+  '######################################################','##############'+
   '#'#010+
   '# Info rules'#010+
   '#####################################################################'#010+
@@ -1278,86 +1286,84 @@ const fpcmakeini : array[0..125,1..240] of char=(
   'fpc_info:'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  == Package info =='#010+
-  '        @$(ECHO)  Pack','age Name..... $(PACKAGE_NAME)'#010+
-  '        @$(ECHO)  Package Version.. $(PACKAGE_VERSION)'#010+
+  '        @$(ECHO)  Package Name..... $(PACKAGE_NAME)'#010+
+  '      ','  @$(ECHO)  Package Version.. $(PACKAGE_VERSION)'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  == Configuration info =='#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  FPC.......... $(FPC)'#010+
-  '        @$(ECHO)  FPC Version.. $(FPC_V','ERSION)'#010+
-  '        @$(ECHO)  Source CPU... $(CPU_SOURCE)'#010+
+  '        @$(ECHO)  FPC Version.. $(FPC_VERSION)'#010+
+  '        @$(ECHO)  Source CPU','... $(CPU_SOURCE)'#010+
   '        @$(ECHO)  Target CPU... $(CPU_TARGET)'#010+
   '        @$(ECHO)  Source OS.... $(OS_SOURCE)'#010+
   '        @$(ECHO)  Target OS.... $(OS_TARGET)'#010+
   '        @$(ECHO)'#010+
-  '        @$(ECHO)  == Directory in','fo =='#010+
+  '        @$(ECHO)  == Directory info =='#010+
   '        @$(ECHO)'#010+
-  '        @$(ECHO)  Basedir......... $(BASEDIR)'#010+
+  '        @$(EC','HO)  Basedir......... $(BASEDIR)'#010+
   '        @$(ECHO)  FPCDir.......... $(FPCDIR)'#010+
   '        @$(ECHO)  UnitsDir........ $(UNITSDIR)'#010+
   '        @$(ECHO)  PackagesDir..... $(PACKAGESDIR)'#010+
   '        @$(ECHO)'#010+
-  '        @$(E','CHO)  GCC library..... $(GCCLIBDIR)'#010+
+  '        @$(ECHO)  GCC library..... $(GCCLIBDIR)'#010,
   '        @$(ECHO)  Other library... $(OTHERLIBDIR)'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  == Tools info =='#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  Pwd....... $(PWD)'#010+
   '        @$(ECHO)  Echo...... $(ECHO)'#010+
-  '        @$(E','CHO)  PPUMove... $(PPUMOVE)'#010+
-  '        @$(ECHO)  PPUFiles.. $(PPUFILES)'#010+
+  '        @$(ECHO)  PPUMove... $(PPUMOVE)'#010+
+  '        ','@$(ECHO)  PPUFiles.. $(PPUFILES)'#010+
   '        @$(ECHO)  Date...... $(DATE)'#010+
   '        @$(ECHO)  Upx....... $(UPXPROG)'#010+
   '        @$(ECHO)  Zip....... $(ZIPPROG)'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  == Object info =='#010+
-  ' ','       @$(ECHO)'#010+
-  '        @$(ECHO)  Target Loaders...... $(TARGET_LOADERS)'#010+
+  '        @$(ECHO)'#010+
+  '        @$(ECHO)  Ta','rget Loaders...... $(TARGET_LOADERS)'#010+
   '        @$(ECHO)  Target Units........ $(TARGET_UNITS)'#010+
   '        @$(ECHO)  Target Programs..... $(TARGET_PROGRAMS)'#010+
-  '        @$(ECHO)  Target Dirs......... $(TARGET_DIRS)'#010,
-  '        @$(ECHO)  Target Examples..... $(TARGET_EXAMPLES)'#010+
+  '        @$(ECHO)  Target Dirs......... $(TARGET_DIRS)'#010+
+  '        @$(ECHO)  Target Examples...','.. $(TARGET_EXAMPLES)'#010+
   '        @$(ECHO)  Target ExampleDirs.. $(TARGET_EXAMPLEDIRS)'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  Clean Units......... $(CLEAN_UNITS)'#010+
-  '        @$(ECHO)  Clean Files......... $(CLEAN_FIL','ES)'#010+
+  '        @$(ECHO)  Clean Files......... $(CLEAN_FILES)'#010+
   '        @$(ECHO)'#010+
-  '        @$(ECHO)  Install Units....... $(INSTALL_UNITS)'#010+
+  '        @$(ECHO',')  Install Units....... $(INSTALL_UNITS)'#010+
   '        @$(ECHO)  Install Files....... $(INSTALL_FILES)'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  == Install info =='#010+
   '        @$(ECHO)'#010+
-  '        @$(ECHO)  DateStr...........','... $(DATESTR)'#010+
-  '        @$(ECHO)  ZipPrefix............ $(ZIPPREFIX)'#010+
+  '        @$(ECHO)  DateStr.............. $(DATESTR)'#010+
+  '        @$(ECHO)  Zip','Prefix............ $(ZIPPREFIX)'#010+
   '        @$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)'#010+
   '        @$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+
   '        @$(ECHO)'#010+
-  '        @$(ECHO)  Install base dir..... ','$(INSTALL_BASEDIR)'#010+
-  '        @$(ECHO)  Install binary dir... $(INSTALL_BINDIR)'#010+
+  '        @$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)'#010+
+  '        @$(ECHO) ',' Install binary dir... $(INSTALL_BINDIR)'#010+
   '        @$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)'#010+
   '        @$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)'#010+
-  '        @$(ECHO)  Install source dir... $(INST','ALL_SOURCEDIR)'#010+
-  '        @$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)'#010+
+  '        @$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)'#010+
+  '        @$(ECHO)  Ins','tall doc dir...... $(INSTALL_DOCDIR)'#010+
   '        @$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)'#010+
   '        @$(ECHO)  Install data dir..... $(INSTALL_DATADIR)'#010+
   '        @$(ECHO)'#010+
-  '        @$(ECHO)  Dist destin','ation dir. $(DIST_DESTDIR)'#010+
-  '        @$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)'#010+
+  '        @$(ECHO)  Dist destination dir. $(DIST_DESTDIR)'#010+
+  '        @','$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)'#010+
   '        @$(ECHO)'#010+
   #010+
   '[localmakefile]'#010+
   '#####################################################################'#010+
   '# Local Makefile'#010+
-  '####################################','################################'+
-  '#'#010+
+  '#####################################################################'#010+
   #010+
-  'ifneq ($(wildcard fpcmake.loc),)'#010+
+  'i','fneq ($(wildcard fpcmake.loc),)'#010+
   'include fpcmake.loc'#010+
   'endif'#010+
   #010+
   '[userrules]'#010+
   '#####################################################################'#010+
   '# Users rules'#010+
-  '#################################################','###################'+
-  '#'#010
+  '#####################################################################'#010
 );

utils/fpcm/fpcmake.ini

@@ -179,7 +179,7 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 
 # echo
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -301,9 +301,9 @@ export PPUFILES
 
 # gdate/date
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -1042,6 +1042,13 @@ ifdef TARGET_EXAMPLEDIRS
         $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
 
+[distinstallrules]
+#####################################################################
+# Dist Install
+#####################################################################
+
+.PHONY: fpc_distinstall
+
 fpc_distinstall: install exampleinstall
 
 

utils/fpcm/fpcmwr.pp

@@ -25,7 +25,7 @@ interface
       tsections=(sec_none,
         sec_units,sec_exes,sec_loaders,sec_examples,
         sec_compile,sec_install,
-        sec_zipinstall,sec_clean,sec_libs,
+        sec_distinstall,sec_zipinstall,sec_clean,sec_libs,
         sec_command,sec_exts,sec_dirs,sec_tools,sec_info
       );
 
@@ -55,7 +55,7 @@ interface
         sec_compile,sec_compile,
         sec_examples,
         sec_libs,sec_libs,
-        sec_install,sec_install,sec_install,sec_install,
+        sec_install,sec_install,sec_install,sec_distinstall,
         sec_zipinstall,sec_zipinstall,sec_zipinstall,sec_zipinstall,
         sec_clean,sec_clean,sec_clean,
         sec_info
@@ -487,7 +487,7 @@ implementation
              if CheckVariable('default_dir') then
               hs:=hs+' $(addsuffix _'+rule2str[rule]+',$(DEFAULT_DIR))'
              else
-              if not(rule in [r_sourceinstall,r_zipinstall,r_zipsourceinstall]) or
+              if not(rule in [r_sourceinstall,r_distinstall,r_zipinstall,r_zipsourceinstall]) or
                  not(CheckVariable('package_name')) then
                hs:=hs+' $(addsuffix _'+rule2str[rule]+',$(TARGET_DIRS))';
            end;
@@ -644,7 +644,10 @@ implementation
          begin
            { Turn some sections off }
            if not FInput.IsPackage then
-            FHasSection[sec_zipinstall]:=false;
+	    begin
+              FHasSection[sec_zipinstall]:=false;
+              FHasSection[sec_distinstall]:=false;
+	    end;  
            { Header }
            Add('#');
            Add('# Don''t edit, this file is generated by '+TitleDate);
@@ -748,6 +751,8 @@ implementation
             AddIniSection('libraryrules');
            { install }
            AddIniSection('installrules');
+           if FHasSection[sec_distinstall] then
+            AddIniSection('distinstallrules');
            if FHasSection[sec_zipinstall] then
             AddIniSection('zipinstallrules');
            { clean }
@@ -775,7 +780,11 @@ implementation
 end.
 {
   $Log$
-  Revision 1.7  2001-05-03 21:35:10  peter
+  Revision 1.8  2001-05-30 21:39:17  peter
+    * gecho, gdate fixes
+    * distinstall target rewrite to not install things twice
+
+  Revision 1.7  2001/05/03 21:35:10  peter
     * Makefile fixes
 
   Revision 1.6  2001/02/24 10:44:33  peter

utils/fprcp/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -121,7 +121,7 @@ override TARGET_PROGRAMS+=fprcp
 override CLEAN_UNITS+=comments expr pasprep
 override INSTALL_FPCPACKAGE=y
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -204,9 +204,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -684,7 +684,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -813,7 +812,7 @@ shared: fpc_shared
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
+distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall:

utils/h2pas/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -122,7 +122,7 @@ override CLEAN_UNITS+=options lexlib scan yacclib converu
 override INSTALL_FPCPACKAGE=y
 override COMPILER_OPTIONS+=-Sg
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -205,9 +205,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -685,7 +685,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -814,7 +813,7 @@ shared: fpc_shared
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
+distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall:

utils/simulator/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -121,7 +121,7 @@ override TARGET_PROGRAMS+=alphasim
 override CLEAN_UNITS+=mm64 fastmm64 simlib simbase
 override INSTALL_FPCPACKAGE=y
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -204,9 +204,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -684,7 +684,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -813,7 +812,7 @@ shared: fpc_shared
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
+distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall:

utils/tply/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif
@@ -123,7 +123,7 @@ override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lext
 override INSTALL_FPCPACKAGE=y
 override COMPILER_OPTIONS+=-Sg
 ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -206,9 +206,9 @@ endif
 endif
 export PPUFILES
 ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
@@ -694,7 +694,6 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -822,7 +821,7 @@ smart: fpc_smart
 shared: fpc_shared
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
+distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall: