Browse Source

* fixed exporting of variables which are declared by commandline or
set in the Makefile itself

peter 26 years ago
parent
commit
8baf3100ca
57 changed files with 2416 additions and 1771 deletions
  1. 43 31
      base/Makefile
  2. 47 33
      compiler/Makefile
  3. 47 33
      compiler/new/Makefile
  4. 11 9
      fcl/Makefile
  5. 45 32
      fcl/db/Makefile
  6. 43 31
      fcl/go32v2/Makefile
  7. 43 31
      fcl/linux/Makefile
  8. 43 31
      fcl/os2/Makefile
  9. 43 31
      fcl/shedit/Makefile
  10. 43 31
      fcl/template/Makefile
  11. 43 31
      fcl/tests/Makefile
  12. 43 31
      fcl/win32/Makefile
  13. 11 9
      ide/Makefile
  14. 11 9
      ide/fake/Makefile
  15. 43 31
      ide/fake/compiler/Makefile
  16. 43 31
      ide/fake/gdb/Makefile
  17. 45 32
      ide/text/Makefile
  18. 83 59
      install/Makefile
  19. 155 144
      install/Makefile.fpc
  20. 43 31
      install/demo/Makefile
  21. 86 66
      install/fpinst/Makefile
  22. 30 15
      install/fpinst/Makefile.fpc
  23. 11 9
      packages/Makefile
  24. 43 31
      packages/forms/Makefile
  25. 45 32
      packages/forms/demo/Makefile
  26. 45 32
      packages/gdbint/Makefile
  27. 11 9
      packages/gdbint/libgdb/Makefile
  28. 43 31
      packages/ggi/Makefile
  29. 43 31
      packages/gtk/Makefile
  30. 47 33
      packages/gtk/examples/Makefile
  31. 47 33
      packages/gtk/tutorial/Makefile
  32. 43 31
      packages/ibase/Makefile
  33. 43 31
      packages/inet/Makefile
  34. 43 31
      packages/mysql/Makefile
  35. 43 31
      packages/ncurses/Makefile
  36. 11 9
      packages/opengl/Makefile
  37. 45 32
      packages/opengl/examples/Makefile
  38. 43 31
      packages/opengl/linux/Makefile
  39. 43 31
      packages/paszlib/Makefile
  40. 43 31
      packages/postgres/Makefile
  41. 43 31
      packages/svgalib/Makefile
  42. 43 31
      packages/uncgi/Makefile
  43. 43 31
      packages/utmp/Makefile
  44. 43 31
      packages/x11/Makefile
  45. 43 31
      packages/zlib/Makefile
  46. 11 9
      rtl/Makefile
  47. 43 31
      rtl/go32v1/Makefile
  48. 43 31
      rtl/go32v2/Makefile
  49. 43 31
      rtl/linux/Makefile
  50. 43 31
      rtl/os2/Makefile
  51. 43 31
      rtl/win32/Makefile
  52. 11 9
      tests/Makefile
  53. 45 32
      utils/Makefile
  54. 54 37
      utils/fpcmake.ini
  55. 43 31
      utils/h2pas/Makefile
  56. 43 31
      utils/simulator/Makefile
  57. 43 31
      utils/tply/Makefile

+ 43 - 31
base/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 21:01
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: info
@@ -67,41 +67,43 @@ endif
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -189,11 +191,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -270,56 +273,58 @@ endif
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -363,11 +368,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -375,9 +381,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -385,9 +392,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -395,9 +403,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -413,12 +422,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -428,12 +438,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -447,9 +458,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip

+ 47 - 33
compiler/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -67,41 +67,43 @@ endif
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -262,11 +264,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -425,56 +428,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -518,11 +523,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -530,9 +536,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -540,9 +547,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -550,9 +558,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -568,12 +577,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -583,12 +593,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -602,9 +613,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip
@@ -616,9 +628,10 @@ CMP:=$(strip $(wildcard $(addsuffix /cmp$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(CMP),)
 CMP=
 else
-export CMP:=$(firstword $(CMP))
+CMP:=$(firstword $(CMP))
 endif
 endif
+export CMP
 
 # diff
 ifndef DIFF
@@ -626,9 +639,10 @@ DIFF:=$(strip $(wildcard $(addsuffix /diff$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(DIFF),)
 DIFF=
 else
-export DIFF:=$(firstword $(DIFF))
+DIFF:=$(firstword $(DIFF))
 endif
 endif
+export DIFF
 
 #####################################################################
 # Default extensions

+ 47 - 33
compiler/new/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -67,41 +67,43 @@ endif
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -279,11 +281,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -451,56 +454,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -544,11 +549,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -556,9 +562,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -566,9 +573,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -576,9 +584,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -594,12 +603,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -609,12 +619,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -628,9 +639,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip
@@ -642,9 +654,10 @@ CMP:=$(strip $(wildcard $(addsuffix /cmp$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(CMP),)
 CMP=
 else
-export CMP:=$(firstword $(CMP))
+CMP:=$(firstword $(CMP))
 endif
 endif
+export CMP
 
 # diff
 ifndef DIFF
@@ -652,9 +665,10 @@ DIFF:=$(strip $(wildcard $(addsuffix /diff$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(DIFF),)
 DIFF=
 else
-export DIFF:=$(firstword $(DIFF))
+DIFF:=$(firstword $(DIFF))
 endif
 endif
+export DIFF
 
 #####################################################################
 # Default extensions

+ 11 - 9
fcl/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -67,41 +67,43 @@ endif
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################

+ 45 - 32
fcl/db/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -73,41 +73,43 @@ override CPU_TARGET:=i386
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -208,11 +210,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -227,9 +230,10 @@ endif
 # On linux, try to find where libgcc.a is.
 ifdef inlinux
 ifndef GCCLIBDIR
-export GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`)
+GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`)
 endif
 endif
+export GCCLIBDIR
 
 #####################################################################
 # Install Directories
@@ -387,56 +391,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -480,11 +486,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -492,9 +499,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -502,9 +510,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -512,9 +521,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -530,12 +540,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -545,12 +556,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -564,9 +576,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip

+ 43 - 31
fcl/go32v2/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -73,41 +73,43 @@ override OS_TARGET:=go32v2
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -218,11 +220,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -390,56 +393,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -483,11 +488,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -495,9 +501,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -505,9 +512,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -515,9 +523,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -533,12 +542,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -548,12 +558,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -567,9 +578,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip

+ 43 - 31
fcl/linux/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -73,41 +73,43 @@ override OS_TARGET:=linux
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -218,11 +220,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -390,56 +393,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -483,11 +488,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -495,9 +501,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -505,9 +512,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -515,9 +523,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -533,12 +542,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -548,12 +558,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -567,9 +578,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip

+ 43 - 31
fcl/os2/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -73,41 +73,43 @@ override OS_TARGET:=os2
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -212,11 +214,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -380,56 +383,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -473,11 +478,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -485,9 +491,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -495,9 +502,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -505,9 +513,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -523,12 +532,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -538,12 +548,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -557,9 +568,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip

+ 43 - 31
fcl/shedit/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -67,41 +67,43 @@ endif
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -218,11 +220,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -381,56 +384,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -474,11 +479,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -486,9 +492,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -496,9 +503,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -506,9 +514,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -524,12 +533,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -539,12 +549,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -558,9 +569,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip

+ 43 - 31
fcl/template/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -74,41 +74,43 @@ override CPU_TARGET:=i386
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -212,11 +214,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -380,56 +383,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -473,11 +478,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -485,9 +491,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -495,9 +502,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -505,9 +513,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -523,12 +532,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -538,12 +548,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -557,9 +568,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip

+ 43 - 31
fcl/tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -67,41 +67,43 @@ endif
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -198,11 +200,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -365,56 +368,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -458,11 +463,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -470,9 +476,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -480,9 +487,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -490,9 +498,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -508,12 +517,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -523,12 +533,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -542,9 +553,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip

+ 43 - 31
fcl/win32/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -73,41 +73,43 @@ override OS_TARGET:=win32
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -218,11 +220,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -390,56 +393,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -483,11 +488,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -495,9 +501,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -505,9 +512,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -515,9 +523,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -533,12 +542,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -548,12 +558,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -567,9 +578,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip

+ 11 - 9
ide/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -67,41 +67,43 @@ endif
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################

+ 11 - 9
ide/fake/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -67,41 +67,43 @@ endif
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################

+ 43 - 31
ide/fake/compiler/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -67,41 +67,43 @@ endif
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -186,11 +188,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -332,56 +335,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -425,11 +430,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -437,9 +443,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -447,9 +454,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -457,9 +465,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -475,12 +484,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -490,12 +500,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -509,9 +520,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip

+ 43 - 31
ide/fake/gdb/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -67,41 +67,43 @@ endif
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -186,11 +188,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -332,56 +335,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -425,11 +430,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -437,9 +443,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -447,9 +454,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -457,9 +465,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -475,12 +484,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -490,12 +500,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -509,9 +520,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip

+ 45 - 32
ide/text/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -67,41 +67,43 @@ endif
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -243,11 +245,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -262,9 +265,10 @@ endif
 # On linux, try to find where libgcc.a is.
 ifdef inlinux
 ifndef GCCLIBDIR
-export GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`)
+GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`)
 endif
 endif
+export GCCLIBDIR
 
 #####################################################################
 # Install Directories
@@ -425,56 +429,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -518,11 +524,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -530,9 +537,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -540,9 +548,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -550,9 +559,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -568,12 +578,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -583,12 +594,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -602,9 +614,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip

+ 83 - 59
install/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:09
 #
 
 defaultrule: help
@@ -67,41 +67,43 @@ endif
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -137,8 +139,8 @@ endif
 # Pre Settings
 
 # Test dir if none specified
-ifndef BASEINSTALLDIR
-BASEINSTALLDIR=/pptest
+ifndef PREFIXINSTALLDIR
+PREFIXINSTALLDIR=/pptest
 endif
 
 # Directory to the base of the CVS tree
@@ -150,12 +152,18 @@ PACKDIR=$(subst \,/,$(TMP))/pp_tmp
 
 # Use new ppc386
 PPNEW=$(BASEDIR)/$(CVSBASE)/compiler/ppc386.exe
+PPUFILESNEW=$(BASEDIR)/$(CVSBASE)/utils/ppufiles.exe
 
 # Test dir if none specified
 ifndef PACKAGEDIR
 PACKAGEDIR=$(BASEDIR)
 endif
 
+BUILDOPTSGO32V2=OS_TARGET=go32v2 FPC=$(PPNEW) RELEASE=1
+INSTALLOPTSGO32V2=OS_TARGET=go32v2 FPC=$(PPNEW) PPUFILES=$(PPUFILESNEW)
+BUILDOPTSWIN32=OS_TARGET=win32 FPC=$(PPNEW) RELEASE=1
+INSTALLOPTSWIN32=OS_TARGET=win32 FPC=$(PPNEW) PPUFILES=$(PPUFILESNEW)
+
 # Targets
 
 
@@ -206,11 +214,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -360,56 +369,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -453,11 +464,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -465,9 +477,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -475,9 +488,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -485,9 +499,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -503,12 +518,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -518,12 +534,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -537,9 +554,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip
@@ -921,7 +939,7 @@ help:
 	@echo Possible targets are:
 	@echo
 	@echo basego32, basego32.zip
-	@echo basew32,	basew32.zip
+	@echo basew32,  basew32.zip
 	@echo
 	@exit
 
@@ -930,40 +948,46 @@ help:
 ##########################################################################
 
 installer:
-	$(MAKE) -C $(CVSBASE)/rtl/go32v2 all RELEASE=1
-	$(MAKE) -C $(CVSBASE)/api all RELEASE=1
-	$(MAKE) -C $(CVSBASE)/fv all RELEASE=1
 	$(MAKE) -C fpinst all RELEASE=1
 
 ##########################################################################
 # Basego32.zip
 ##########################################################################
 
+p:
+	$(MAKE) -C $(CVSBASE) compiler_install $(INSTALLOPTSGO32V2)
+
 basego32:
-# create dirs
+# create new compiler
+	$(MAKE) -C $(CVSBASE) compiler_cycle OS_TARGET=go32v2 RELEASE=1
+# clean
+	$(MAKE) -C $(CVSBASE) rtl_clean OS_TARGET=go32v2
+	$(MAKE) -C $(CVSBASE) fcl_clean OS_TARGET=go32v2
+	$(MAKE) -C $(CVSBASE) packages_clean OS_TARGET=go32v2
+	$(MAKE) -C $(CVSBASE) utils_clean OS_TARGET=go32v2
+# build everything
+	$(MAKE) -C $(CVSBASE) rtl_smart $(BUILDOPTSGO32V2)
+	$(MAKE) -C $(CVSBASE) fcl_smart $(BUILDOPTSGO32V2)
+	$(MAKE) -C $(CVSBASE) packages_smart $(BUILDOPTSGO32V2)
+	$(MAKE) -C $(CVSBASE) utils_all $(BUILDOPTSGO32V2)
+# install
+	# create dirs
 	$(MKDIR) $(BASEINSTALLDIR)
 	$(MKDIR) $(DOCINSTALLDIR)
 	$(MKDIR) $(BININSTALLDIR)
 	$(MKDIR) $(SOURCEINSTALLDIR)
-# readme & whatsnew and docs
+	# readme & whatsnew and docs
 	$(COPY) doc/*.txt doc/copying* $(DOCINSTALLDIR)
-# bingo32 (cwsdpmi,wmemu387.dxe)
+	# bingo32 (cwsdpmi,wmemu387.dxe)
 	$(COPY) bingo32/* $(BININSTALLDIR)
-# source (base)
-	$(COPY) $(CVSBASE)/base/Makefile $(CVSBASE)/base/makefile.fpc $(SOURCEINSTALLDIR)
-# compiler
-	$(MAKE) -C $(CVSBASE)/compiler cycle OS_TARGET=go32v2 RELEASE=1
-	$(MAKE) -C $(CVSBASE)/compiler install OS_TARGET=go32v2
-# rtl go32v2
-	$(MAKE) -C $(CVSBASE)/rtl/go32v2 clean OS_TARGET=go32v2
-	$(MAKE) -C $(CVSBASE)/rtl/go32v2 install OS_TARGET=go32v2 RELEASE=1 FPC=$(PPNEW)
-# rtl go32v2 libs
-#	$(MAKE) -C $(CVSBASE)/rtl/go32v2 clean OS_TARGET=go32v2
-#	$(MAKE) -C $(CVSBASE)/rtl/go32v2 libinstall OS_TARGET=go32v2 RELEASE=1 PP=$(PPNEW)
-# utils
-	$(MAKE) -C $(CVSBASE)/utils clean OS_TARGET=go32v2
-	$(MAKE) -C $(CVSBASE)/utils all OS_TARGET=go32v2 RELEASE=1 FPC=$(PPNEW)
-	$(MAKE) -C $(CVSBASE)/utils install OS_TARGET=go32v2 RELEASE=1 FPC=$(PPNEW)
+	# source (base)
+	$(COPY) $(CVSBASE)/Makefile $(CVSBASE)/Makefile.fpc $(SOURCEINSTALLDIR)
+	# install generated things
+	$(MAKE) -C $(CVSBASE) compiler_install $(INSTALLOPTSGO32V2)
+	$(MAKE) -C $(CVSBASE) rtl_install $(INSTALLOPTSGO32V2)
+	$(MAKE) -C $(CVSBASE) fcl_install $(INSTALLOPTSGO32V2)
+	$(MAKE) -C $(CVSBASE) packages_install $(INSTALLOPTSGO32V2)
+	$(MAKE) -C $(CVSBASE) utils_install $(INSTALLOPTSGO32V2)
 
 basego32.zip:
 	$(MAKE) basego32 BASEINSTALLDIR=$(PACKDIR)
@@ -995,8 +1019,8 @@ basew32:
 	$(MAKE) -C $(CVSBASE)/rtl/win32 clean OS_TARGET=win32
 	$(MAKE) -C $(CVSBASE)/rtl/win32 install OS_TARGET=win32 RELEASE=1 FPC=$(PPNEW)
 # rtl libs
-#	$(MAKE) -C $(CVSBASE)/rtl/win32 clean OS_TARGET=win32
-#	$(MAKE) -C $(CVSBASE)/rtl/win32 libinstall OS_TARGET=win32 RELEASE=1 FPC=$(PPNEW)
+#       $(MAKE) -C $(CVSBASE)/rtl/win32 clean OS_TARGET=win32
+#       $(MAKE) -C $(CVSBASE)/rtl/win32 libinstall OS_TARGET=win32 RELEASE=1 FPC=$(PPNEW)
 # utils
 	$(MAKE) -C $(CVSBASE)/utils clean OS_TARGET=win32
 	$(MAKE) -C $(CVSBASE)/utils install OS_TARGET=win32 RELEASE=1 FPC=$(PPNEW)
@@ -1032,8 +1056,8 @@ baseemx:
 	$(MAKE) -C $(CVSBASE)/rtl/go32v2 clean OS_TARGET=os2
 	$(MAKE) -C $(CVSBASE)/rtl/go32v2 install OS_TARGET=os2 RELEASE=1 FPC=$(PPNEW)
 # rtl go32v2 libs
-#	$(MAKE) -C $(CVSBASE)/rtl/go32v2 clean OS_TARGET=go32v2
-#	$(MAKE) -C $(CVSBASE)/rtl/go32v2 libinstall OS_TARGET=go32v2 RELEASE=1 FPC=$(PPNEW)
+#       $(MAKE) -C $(CVSBASE)/rtl/go32v2 clean OS_TARGET=go32v2
+#       $(MAKE) -C $(CVSBASE)/rtl/go32v2 libinstall OS_TARGET=go32v2 RELEASE=1 FPC=$(PPNEW)
 # utils
 	$(MAKE) -C $(CVSBASE)/utils clean OS_TARGET=os2
 	$(MAKE) -C $(CVSBASE)/utils install OS_TARGET=os2 RELEASE=1 FPC=$(PPNEW)

+ 155 - 144
install/Makefile.fpc

@@ -18,151 +18,162 @@ tooldate=1
 
 
 [presettings]
-# Test dir if none specified
-ifndef BASEINSTALLDIR
-BASEINSTALLDIR=/pptest
-endif
-
-# Directory to the base of the CVS tree
-CVSBASE=..
-CFG=$(CVSBASE)/rtl/cfg
-
-# Temporary path to pack a file
-PACKDIR=$(subst \,/,$(TMP))/pp_tmp
-
-# Use new ppc386
-PPNEW=$(BASEDIR)/$(CVSBASE)/compiler/ppc386.exe
-
-# Test dir if none specified
-ifndef PACKAGEDIR
-PACKAGEDIR=$(BASEDIR)
-endif
+# Test dir if none specified
+ifndef PREFIXINSTALLDIR
+PREFIXINSTALLDIR=/pptest
+endif
 
+# Directory to the base of the CVS tree
+CVSBASE=..
+CFG=$(CVSBASE)/rtl/cfg
+
+# Temporary path to pack a file
+PACKDIR=$(subst \,/,$(TMP))/pp_tmp
+
+# Use new ppc386
+PPNEW=$(BASEDIR)/$(CVSBASE)/compiler/ppc386.exe
+PPUFILESNEW=$(BASEDIR)/$(CVSBASE)/utils/ppufiles.exe
+
+# Test dir if none specified
+ifndef PACKAGEDIR
+PACKAGEDIR=$(BASEDIR)
+endif
+
+BUILDOPTSGO32V2=OS_TARGET=go32v2 FPC=$(PPNEW) RELEASE=1
+INSTALLOPTSGO32V2=OS_TARGET=go32v2 FPC=$(PPNEW) PPUFILES=$(PPUFILESNEW)
+BUILDOPTSWIN32=OS_TARGET=win32 FPC=$(PPNEW) RELEASE=1
+INSTALLOPTSWIN32=OS_TARGET=win32 FPC=$(PPNEW) PPUFILES=$(PPUFILESNEW)
 
 [rules]
 help:
-	@echo
-	@echo Possible targets are:
-	@echo
-	@echo basego32, basego32.zip
-	@echo basew32,	basew32.zip
-	@echo
-	@exit
-
-##########################################################################
-# Install
-##########################################################################
-
-installer:
-	$(MAKE) -C $(CVSBASE)/rtl/go32v2 all RELEASE=1
-	$(MAKE) -C $(CVSBASE)/api all RELEASE=1
-	$(MAKE) -C $(CVSBASE)/fv all RELEASE=1
-	$(MAKE) -C fpinst all RELEASE=1
-
-##########################################################################
-# Basego32.zip
-##########################################################################
-
-basego32:
-# create dirs
-	$(MKDIR) $(BASEINSTALLDIR)
-	$(MKDIR) $(DOCINSTALLDIR)
-	$(MKDIR) $(BININSTALLDIR)
-	$(MKDIR) $(SOURCEINSTALLDIR)
-# readme & whatsnew and docs
-	$(COPY) doc/*.txt doc/copying* $(DOCINSTALLDIR)
-# bingo32 (cwsdpmi,wmemu387.dxe)
-	$(COPY) bingo32/* $(BININSTALLDIR)
-# source (base)
-	$(COPY) $(CVSBASE)/base/Makefile $(CVSBASE)/base/makefile.fpc $(SOURCEINSTALLDIR)
-# compiler
-	$(MAKE) -C $(CVSBASE)/compiler cycle OS_TARGET=go32v2 RELEASE=1
-	$(MAKE) -C $(CVSBASE)/compiler install OS_TARGET=go32v2
-# rtl go32v2
-	$(MAKE) -C $(CVSBASE)/rtl/go32v2 clean OS_TARGET=go32v2
-	$(MAKE) -C $(CVSBASE)/rtl/go32v2 install OS_TARGET=go32v2 RELEASE=1 FPC=$(PPNEW)
-# rtl go32v2 libs
-#	$(MAKE) -C $(CVSBASE)/rtl/go32v2 clean OS_TARGET=go32v2
-#	$(MAKE) -C $(CVSBASE)/rtl/go32v2 libinstall OS_TARGET=go32v2 RELEASE=1 PP=$(PPNEW)
-# utils
-	$(MAKE) -C $(CVSBASE)/utils clean OS_TARGET=go32v2
-	$(MAKE) -C $(CVSBASE)/utils all OS_TARGET=go32v2 RELEASE=1 FPC=$(PPNEW)
-	$(MAKE) -C $(CVSBASE)/utils install OS_TARGET=go32v2 RELEASE=1 FPC=$(PPNEW)
-
-basego32.zip:
-	$(MAKE) basego32 BASEINSTALLDIR=$(PACKDIR)
-	cd $(PACKDIR) ; $(ZIPPROG) $(PACKAGEDIR)/basego32.zip * ; cd $(BASEDIR)
-	$(DELTREE) $(PACKDIR)
-
-
-##########################################################################
-# basew32.zip
-##########################################################################
-
-basew32:
-# create dirs
-	$(MKDIR) $(BASEINSTALLDIR)
-	$(MKDIR) $(DOCINSTALLDIR)
-	$(MKDIR) $(BININSTALLDIR)
-	$(MKDIR) $(SOURCEINSTALLDIR)
-# readme & whatsnew and docs
-	$(COPY) doc/*.txt doc/copying* $(DOCINSTALLDIR)
-# source (base)
-	$(COPY) $(CVSBASE)/base/Makefile $(CVSBASE)/base/makefile.fpc $(SOURCEINSTALLDIR)
-# readme.txt & whatsnew.txt
-	$(MKDIR) $(BASEINSTALLDIR)
-	$(COPY) readme.txt whatsnew.txt $(BASEINSTALLDIR)
-# compiler, the - is necessary because the files sometimes differ
-	-$(MAKE) -C $(CVSBASE)/compiler cycle OS_TARGET=win32 RELEASE=1
-	$(MAKE) -C $(CVSBASE)/compiler install OS_TARGET=win32
-# rtl
-	$(MAKE) -C $(CVSBASE)/rtl/win32 clean OS_TARGET=win32
-	$(MAKE) -C $(CVSBASE)/rtl/win32 install OS_TARGET=win32 RELEASE=1 FPC=$(PPNEW)
-# rtl libs
-#	$(MAKE) -C $(CVSBASE)/rtl/win32 clean OS_TARGET=win32
-#	$(MAKE) -C $(CVSBASE)/rtl/win32 libinstall OS_TARGET=win32 RELEASE=1 FPC=$(PPNEW)
-# utils
-	$(MAKE) -C $(CVSBASE)/utils clean OS_TARGET=win32
-	$(MAKE) -C $(CVSBASE)/utils install OS_TARGET=win32 RELEASE=1 FPC=$(PPNEW)
-
-basew32.zip:
-	$(MAKE) basew32 BASEINSTALLDIR=$(PACKDIR)
-	$(MKDIR) $(PACKAGEDIR)
-# Maybe you need 4dos for it, becuase unix paths with / are used
-	cd $(PACKDIR)
-	$(ZIPPROG) $(PACKAGEDIR)/basew32.zip *
-	cd $(BASEDIR)
-	$(DELTREE) $(PACKDIR)
-
-
-##########################################################################
-# Baseemx.zip
-##########################################################################
-
-baseemx:
-# create dirs
-	$(MKDIR) $(BASEINSTALLDIR)
-	$(MKDIR) $(DOCINSTALLDIR)
-	$(MKDIR) $(BININSTALLDIR)
-	$(MKDIR) $(SOURCEINSTALLDIR)
-# readme & whatsnew and docs
-	$(COPY) doc/*.txt doc/copying* $(DOCINSTALLDIR)
-# source (base)
-	$(COPY) $(CVSBASE)/base/Makefile $(CVSBASE)/base/makefile.fpc $(SOURCEINSTALLDIR)
-# compiler
-	$(MAKE) -C $(CVSBASE)/compiler cycle OS_TARGET=os2 RELEASE=1
-	$(MAKE) -C $(CVSBASE)/compiler install OS_TARGET=os2
-# rtl os2
-	$(MAKE) -C $(CVSBASE)/rtl/go32v2 clean OS_TARGET=os2
-	$(MAKE) -C $(CVSBASE)/rtl/go32v2 install OS_TARGET=os2 RELEASE=1 FPC=$(PPNEW)
-# rtl go32v2 libs
-#	$(MAKE) -C $(CVSBASE)/rtl/go32v2 clean OS_TARGET=go32v2
-#	$(MAKE) -C $(CVSBASE)/rtl/go32v2 libinstall OS_TARGET=go32v2 RELEASE=1 FPC=$(PPNEW)
-# utils
-	$(MAKE) -C $(CVSBASE)/utils clean OS_TARGET=os2
-	$(MAKE) -C $(CVSBASE)/utils install OS_TARGET=os2 RELEASE=1 FPC=$(PPNEW)
-
-baseemx.zip:
-	$(MAKE) baseemx BASEINSTALLDIR=$(PACKDIR)
-	cd $(PACKDIR) ; $(ZIPPROG) $(PACKAGEDIR)/baseemx.zip * ; cd $(BASEDIR)
-	$(DELTREE) $(PACKDIR)
+        @echo
+        @echo Possible targets are:
+        @echo
+        @echo basego32, basego32.zip
+        @echo basew32,  basew32.zip
+        @echo
+        @exit
+
+##########################################################################
+# Install
+##########################################################################
+
+installer:
+        $(MAKE) -C fpinst all RELEASE=1
+
+##########################################################################
+# Basego32.zip
+##########################################################################
+
+p:
+        $(MAKE) -C $(CVSBASE) compiler_install $(INSTALLOPTSGO32V2)
+
+basego32:
+# create new compiler
+        $(MAKE) -C $(CVSBASE) compiler_cycle OS_TARGET=go32v2 RELEASE=1
+# clean
+        $(MAKE) -C $(CVSBASE) rtl_clean OS_TARGET=go32v2
+        $(MAKE) -C $(CVSBASE) fcl_clean OS_TARGET=go32v2
+        $(MAKE) -C $(CVSBASE) packages_clean OS_TARGET=go32v2
+        $(MAKE) -C $(CVSBASE) utils_clean OS_TARGET=go32v2
+# build everything
+        $(MAKE) -C $(CVSBASE) rtl_smart $(BUILDOPTSGO32V2)
+        $(MAKE) -C $(CVSBASE) fcl_smart $(BUILDOPTSGO32V2)
+        $(MAKE) -C $(CVSBASE) packages_smart $(BUILDOPTSGO32V2)
+        $(MAKE) -C $(CVSBASE) utils_all $(BUILDOPTSGO32V2)
+# install
+        # create dirs
+        $(MKDIR) $(BASEINSTALLDIR)
+        $(MKDIR) $(DOCINSTALLDIR)
+        $(MKDIR) $(BININSTALLDIR)
+        $(MKDIR) $(SOURCEINSTALLDIR)
+        # readme & whatsnew and docs
+        $(COPY) doc/*.txt doc/copying* $(DOCINSTALLDIR)
+        # bingo32 (cwsdpmi,wmemu387.dxe)
+        $(COPY) bingo32/* $(BININSTALLDIR)
+        # source (base)
+        $(COPY) $(CVSBASE)/Makefile $(CVSBASE)/Makefile.fpc $(SOURCEINSTALLDIR)
+        # install generated things
+        $(MAKE) -C $(CVSBASE) compiler_install $(INSTALLOPTSGO32V2)
+        $(MAKE) -C $(CVSBASE) rtl_install $(INSTALLOPTSGO32V2)
+        $(MAKE) -C $(CVSBASE) fcl_install $(INSTALLOPTSGO32V2)
+        $(MAKE) -C $(CVSBASE) packages_install $(INSTALLOPTSGO32V2)
+        $(MAKE) -C $(CVSBASE) utils_install $(INSTALLOPTSGO32V2)
+
+basego32.zip:
+        $(MAKE) basego32 BASEINSTALLDIR=$(PACKDIR)
+        cd $(PACKDIR) ; $(ZIPPROG) $(PACKAGEDIR)/basego32.zip * ; cd $(BASEDIR)
+        $(DELTREE) $(PACKDIR)
+
+
+##########################################################################
+# basew32.zip
+##########################################################################
+
+basew32:
+# create dirs
+        $(MKDIR) $(BASEINSTALLDIR)
+        $(MKDIR) $(DOCINSTALLDIR)
+        $(MKDIR) $(BININSTALLDIR)
+        $(MKDIR) $(SOURCEINSTALLDIR)
+# readme & whatsnew and docs
+        $(COPY) doc/*.txt doc/copying* $(DOCINSTALLDIR)
+# source (base)
+        $(COPY) $(CVSBASE)/base/Makefile $(CVSBASE)/base/makefile.fpc $(SOURCEINSTALLDIR)
+# readme.txt & whatsnew.txt
+        $(MKDIR) $(BASEINSTALLDIR)
+        $(COPY) readme.txt whatsnew.txt $(BASEINSTALLDIR)
+# compiler, the - is necessary because the files sometimes differ
+        -$(MAKE) -C $(CVSBASE)/compiler cycle OS_TARGET=win32 RELEASE=1
+        $(MAKE) -C $(CVSBASE)/compiler install OS_TARGET=win32
+# rtl
+        $(MAKE) -C $(CVSBASE)/rtl/win32 clean OS_TARGET=win32
+        $(MAKE) -C $(CVSBASE)/rtl/win32 install OS_TARGET=win32 RELEASE=1 FPC=$(PPNEW)
+# rtl libs
+#       $(MAKE) -C $(CVSBASE)/rtl/win32 clean OS_TARGET=win32
+#       $(MAKE) -C $(CVSBASE)/rtl/win32 libinstall OS_TARGET=win32 RELEASE=1 FPC=$(PPNEW)
+# utils
+        $(MAKE) -C $(CVSBASE)/utils clean OS_TARGET=win32
+        $(MAKE) -C $(CVSBASE)/utils install OS_TARGET=win32 RELEASE=1 FPC=$(PPNEW)
+
+basew32.zip:
+        $(MAKE) basew32 BASEINSTALLDIR=$(PACKDIR)
+        $(MKDIR) $(PACKAGEDIR)
+# Maybe you need 4dos for it, becuase unix paths with / are used
+        cd $(PACKDIR)
+        $(ZIPPROG) $(PACKAGEDIR)/basew32.zip *
+        cd $(BASEDIR)
+        $(DELTREE) $(PACKDIR)
+
+
+##########################################################################
+# Baseemx.zip
+##########################################################################
+
+baseemx:
+# create dirs
+        $(MKDIR) $(BASEINSTALLDIR)
+        $(MKDIR) $(DOCINSTALLDIR)
+        $(MKDIR) $(BININSTALLDIR)
+        $(MKDIR) $(SOURCEINSTALLDIR)
+# readme & whatsnew and docs
+        $(COPY) doc/*.txt doc/copying* $(DOCINSTALLDIR)
+# source (base)
+        $(COPY) $(CVSBASE)/base/Makefile $(CVSBASE)/base/makefile.fpc $(SOURCEINSTALLDIR)
+# compiler
+        $(MAKE) -C $(CVSBASE)/compiler cycle OS_TARGET=os2 RELEASE=1
+        $(MAKE) -C $(CVSBASE)/compiler install OS_TARGET=os2
+# rtl os2
+        $(MAKE) -C $(CVSBASE)/rtl/go32v2 clean OS_TARGET=os2
+        $(MAKE) -C $(CVSBASE)/rtl/go32v2 install OS_TARGET=os2 RELEASE=1 FPC=$(PPNEW)
+# rtl go32v2 libs
+#       $(MAKE) -C $(CVSBASE)/rtl/go32v2 clean OS_TARGET=go32v2
+#       $(MAKE) -C $(CVSBASE)/rtl/go32v2 libinstall OS_TARGET=go32v2 RELEASE=1 FPC=$(PPNEW)
+# utils
+        $(MAKE) -C $(CVSBASE)/utils clean OS_TARGET=os2
+        $(MAKE) -C $(CVSBASE)/utils install OS_TARGET=os2 RELEASE=1 FPC=$(PPNEW)
+
+baseemx.zip:
+        $(MAKE) baseemx BASEINSTALLDIR=$(PACKDIR)
+        cd $(PACKDIR) ; $(ZIPPROG) $(PACKAGEDIR)/baseemx.zip * ; cd $(BASEDIR)
+        $(DELTREE) $(PACKDIR)

+ 43 - 31
install/demo/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -67,41 +67,43 @@ endif
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -202,11 +204,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -365,56 +368,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -458,11 +463,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -470,9 +476,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -480,9 +487,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -490,9 +498,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -508,12 +517,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -523,12 +533,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -542,9 +553,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip

+ 86 - 66
install/fpinst/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -59,6 +59,12 @@ else
 SEARCHPATH=$(subst ;, ,$(PATH))
 endif
 
+#####################################################################
+# Default target
+#####################################################################
+
+override OS_TARGET:=win32
+
 #####################################################################
 # FPC version/target Detection
 #####################################################################
@@ -67,41 +73,43 @@ endif
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -134,27 +142,23 @@ endif
 #####################################################################
 
 
+# Pre Settings
+
+INC=../inc
+
+# Override defaults
+override PASEXT=.pas
+
+include ../test/Makefile.api
+include $(INC)/Makefile.api
+
 # Targets
 
-override UNITOBJECTS+=ziptypes unzip
-ifeq ($(OS_TARGET),linux)
-override EXEOBJECTS+=installer
-endif
-ifeq ($(OS_TARGET),go32v2)
-override EXEOBJECTS+=install
-endif
-ifeq ($(OS_TARGET),win32)
-override EXEOBJECTS+=install
-endif
-ifeq ($(OS_TARGET),os2)
-override EXEOBJECTS+=install
-endif
+override UNITOBJECTS+=event $(APIOBJECTS)
+override EXAMPLEOBJECTS+=$(TESTOBJECTS)
 
 # Clean
 
-ifeq ($(OS_TARGET),linux)
-override EXTRACLEANFILES+=install.o
-endif
 
 # Install
 
@@ -165,8 +169,9 @@ ZIPTARGET=install
 
 # Directories
 
+vpath %$(PASEXT) $(INC)
 ifndef FPCDIR
-FPCDIR=../..
+FPCDIR=../../..
 endif
 ifndef PACKAGEDIR
 PACKAGEDIR=$(FPCDIR)/packages
@@ -174,7 +179,6 @@ endif
 ifndef COMPONENTDIR
 COMPONENTDIR=$(FPCDIR)/components
 endif
-override NEEDUNITDIR=$(FPCDIR)/fv $(FPCDIR)/api
 ifndef TARGETDIR
 TARGETDIR=.
 endif
@@ -184,6 +188,7 @@ endif
 
 # Libraries
 
+LIBNAME=fpapi
 
 # Info
 
@@ -208,11 +213,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -304,10 +310,6 @@ ifdef UNITSDIR
 override FPCOPT+=-Fu$(UNITSDIR)
 endif
 
-ifdef NEEDUNITDIR
-override FPCOPT+=$(addprefix -Fu,$(NEEDUNITDIR))
-endif
-
 # Target dirs
 ifdef TARGETDIR
 override FPCOPT+=-FE$(TARGETDIR)
@@ -371,56 +373,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -464,11 +468,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -476,9 +481,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -486,9 +492,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -496,9 +503,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -514,12 +522,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -529,12 +538,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -548,9 +558,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip
@@ -651,6 +662,10 @@ all: fpc_all
 
 debug: fpc_debug
 
+examples: fpc_examples
+
+test: fpc_test
+
 smart: fpc_smart
 
 shared: fpc_shared
@@ -671,7 +686,7 @@ cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipinstalladd clean cleanall info
+.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipinstalladd clean cleanall info
 
 #####################################################################
 # Package depends
@@ -702,19 +717,19 @@ override CLEANPPUFILES+=$(UNITPPUFILES)
 fpc_units: $(UNITPPUFILES)
 
 #####################################################################
-# Exes
+# Examples
 #####################################################################
 
-.PHONY: fpc_exes
+.PHONY: fpc_examples fpc_test
 
-override EXEFILES=$(addsuffix $(EXEEXT),$(EXEOBJECTS))
-override EXEOFILES=$(addsuffix $(OEXT),$(EXEOBJECTS))
+override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(EXAMPLEOBJECTS))
+override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(EXAMPLEOBJECTS))
 
-override ALLTARGET+=fpc_exes
-override INSTALLEXEFILES+=$(EXEFILES)
-override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)
+override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)
 
-fpc_exes: $(EXEFILES)
+fpc_examples: all $(EXAMPLEFILES)
+
+fpc_test: examples
 
 #####################################################################
 # General compile rules
@@ -1011,7 +1026,12 @@ endif
 # Users rules
 #####################################################################
 
-ifdef inlinux
-installer: install.pas
-	$(COMPILER) -oinstaller install.pas
-endif
+video$(PPUEXT): $(INC)/video.pas video.inc event$(PPUEXT)
+
+keyboard$(PPUEXT): $(INC)/keyboard.pas keyboard.inc event$(PPUEXT)
+
+mouse$(PPUEXT): $(INC)/mouse.pas mouse.inc event$(PPUEXT)
+
+filectrl$(PPUEXT): $(INC)/filectrl.pas filectrl.inc
+
+event$(PPUEXT): event.pas

+ 30 - 15
install/fpinst/Makefile.fpc

@@ -1,25 +1,40 @@
 #
-#   Makefile.fpc for FPC installer
+#   Makefile.fpc for Free Pascal API (used by Free Vision) for win32
 #
 
-[targets]
-units=ziptypes unzip
-programs_go32v2=install
-programs_win32=install
-programs_os2=install
-programs_linux=installer
+[defaults]
+defaulttarget=win32
 
-[clean]
-files_linux=install.o
+[targets]
+units=event $(APIOBJECTS)
+examples=$(TESTOBJECTS)
 
 [dirs]
-fpcdir=../..
-unitdir=$(FPCDIR)/fv $(FPCDIR)/api
+fpcdir=../../..
 targetdir=.
+sourcesdir=$(INC)
+
+[libs]
+libname=fpapi
+
+
+[presettings]
+INC=../inc
+
+# Override defaults
+override PASEXT=.pas
+
+include ../test/Makefile.api
+include $(INC)/Makefile.api
 
 
 [rules]
-ifdef inlinux
-installer: install.pas
-        $(COMPILER) -oinstaller install.pas
-endif
+video$(PPUEXT): $(INC)/video.pas video.inc event$(PPUEXT)
+
+keyboard$(PPUEXT): $(INC)/keyboard.pas keyboard.inc event$(PPUEXT)
+
+mouse$(PPUEXT): $(INC)/mouse.pas mouse.inc event$(PPUEXT)
+
+filectrl$(PPUEXT): $(INC)/filectrl.pas filectrl.inc
+
+event$(PPUEXT): event.pas

+ 11 - 9
packages/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 21:01
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -67,41 +67,43 @@ endif
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################

+ 43 - 31
packages/forms/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -67,41 +67,43 @@ endif
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -196,11 +198,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -354,56 +357,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -447,11 +452,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -459,9 +465,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -469,9 +476,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -479,9 +487,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -497,12 +506,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -512,12 +522,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -531,9 +542,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip

+ 45 - 32
packages/forms/demo/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -67,41 +67,43 @@ endif
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -201,11 +203,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -220,9 +223,10 @@ endif
 # Where to find other libraries
 ifdef inlinux
 ifndef OTHERLIBDIR
-export OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }')
+OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }')
 endif
 endif
+export OTHERLIBDIR
 
 #####################################################################
 # Install Directories
@@ -371,56 +375,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -464,11 +470,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -476,9 +483,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -486,9 +494,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -496,9 +505,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -514,12 +524,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -529,12 +540,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -548,9 +560,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip

+ 45 - 32
packages/gdbint/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -67,41 +67,43 @@ endif
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -197,11 +199,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -216,9 +219,10 @@ endif
 # On linux, try to find where libgcc.a is.
 ifdef inlinux
 ifndef GCCLIBDIR
-export GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`)
+GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`)
 endif
 endif
+export GCCLIBDIR
 
 #####################################################################
 # Install Directories
@@ -376,56 +380,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -469,11 +475,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -481,9 +488,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -491,9 +499,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -501,9 +510,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -519,12 +529,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -534,12 +545,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -553,9 +565,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip

+ 11 - 9
packages/gdbint/libgdb/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -67,41 +67,43 @@ endif
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################

+ 43 - 31
packages/ggi/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -67,41 +67,43 @@ endif
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -190,11 +192,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -344,56 +347,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -437,11 +442,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -449,9 +455,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -459,9 +466,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -469,9 +477,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -487,12 +496,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -502,12 +512,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -521,9 +532,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip

+ 43 - 31
packages/gtk/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -67,41 +67,43 @@ endif
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -194,11 +196,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -353,56 +356,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -446,11 +451,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -458,9 +464,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -468,9 +475,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -478,9 +486,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -496,12 +505,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -511,12 +521,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -530,9 +541,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip

+ 47 - 33
packages/gtk/examples/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -67,41 +67,43 @@ endif
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -196,11 +198,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -215,16 +218,18 @@ endif
 # On linux, try to find where libgcc.a is.
 ifdef inlinux
 ifndef GCCLIBDIR
-export GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`)
+GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`)
 endif
 endif
+export GCCLIBDIR
 
 # Where to find other libraries
 ifdef inlinux
 ifndef OTHERLIBDIR
-export OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }')
+OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }')
 endif
 endif
+export OTHERLIBDIR
 
 #####################################################################
 # Install Directories
@@ -383,56 +388,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -476,11 +483,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -488,9 +496,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -498,9 +507,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -508,9 +518,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -526,12 +537,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -541,12 +553,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -560,9 +573,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip

+ 47 - 33
packages/gtk/tutorial/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -67,41 +67,43 @@ endif
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -195,11 +197,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -214,16 +217,18 @@ endif
 # On linux, try to find where libgcc.a is.
 ifdef inlinux
 ifndef GCCLIBDIR
-export GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`)
+GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`)
 endif
 endif
+export GCCLIBDIR
 
 # Where to find other libraries
 ifdef inlinux
 ifndef OTHERLIBDIR
-export OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }')
+OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }')
 endif
 endif
+export OTHERLIBDIR
 
 #####################################################################
 # Install Directories
@@ -382,56 +387,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -475,11 +482,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -487,9 +495,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -497,9 +506,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -507,9 +517,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -525,12 +536,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -540,12 +552,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -559,9 +572,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip

+ 43 - 31
packages/ibase/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -67,41 +67,43 @@ endif
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -190,11 +192,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -344,56 +347,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -437,11 +442,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -449,9 +455,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -459,9 +466,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -469,9 +477,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -487,12 +496,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -502,12 +512,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -521,9 +532,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip

+ 43 - 31
packages/inet/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -67,41 +67,43 @@ endif
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -190,11 +192,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -344,56 +347,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -437,11 +442,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -449,9 +455,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -459,9 +466,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -469,9 +477,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -487,12 +496,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -502,12 +512,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -521,9 +532,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip

+ 43 - 31
packages/mysql/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -67,41 +67,43 @@ endif
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -190,11 +192,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -344,56 +347,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -437,11 +442,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -449,9 +455,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -459,9 +466,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -469,9 +477,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -487,12 +496,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -502,12 +512,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -521,9 +532,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip

+ 43 - 31
packages/ncurses/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -67,41 +67,43 @@ endif
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -190,11 +192,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -344,56 +347,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -437,11 +442,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -449,9 +455,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -459,9 +466,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -469,9 +477,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -487,12 +496,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -502,12 +512,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -521,9 +532,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip

+ 11 - 9
packages/opengl/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -67,41 +67,43 @@ endif
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################

+ 45 - 32
packages/opengl/examples/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:33
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -67,41 +67,43 @@ endif
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -201,11 +203,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -220,9 +223,10 @@ endif
 # Where to find other libraries
 ifdef inlinux
 ifndef OTHERLIBDIR
-export OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }')
+OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }')
 endif
 endif
+export OTHERLIBDIR
 
 #####################################################################
 # Install Directories
@@ -371,56 +375,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -464,11 +470,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -476,9 +483,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -486,9 +494,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -496,9 +505,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -514,12 +524,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -529,12 +540,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -548,9 +560,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip

+ 43 - 31
packages/opengl/linux/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -73,41 +73,43 @@ override OS_TARGET:=linux
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -201,11 +203,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -359,56 +362,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -452,11 +457,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -464,9 +470,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -474,9 +481,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -484,9 +492,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -502,12 +511,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -517,12 +527,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -536,9 +547,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip

+ 43 - 31
packages/paszlib/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -67,41 +67,43 @@ endif
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -191,11 +193,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -349,56 +352,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -442,11 +447,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -454,9 +460,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -464,9 +471,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -474,9 +482,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -492,12 +501,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -507,12 +517,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -526,9 +537,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip

+ 43 - 31
packages/postgres/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -67,41 +67,43 @@ endif
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -190,11 +192,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -344,56 +347,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -437,11 +442,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -449,9 +455,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -459,9 +466,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -469,9 +477,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -487,12 +496,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -502,12 +512,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -521,9 +532,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip

+ 43 - 31
packages/svgalib/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -67,41 +67,43 @@ endif
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -190,11 +192,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -344,56 +347,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -437,11 +442,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -449,9 +455,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -459,9 +466,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -469,9 +477,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -487,12 +496,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -502,12 +512,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -521,9 +532,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip

+ 43 - 31
packages/uncgi/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -67,41 +67,43 @@ endif
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -190,11 +192,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -344,56 +347,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -437,11 +442,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -449,9 +455,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -459,9 +466,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -469,9 +477,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -487,12 +496,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -502,12 +512,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -521,9 +532,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip

+ 43 - 31
packages/utmp/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -67,41 +67,43 @@ endif
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -190,11 +192,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -344,56 +347,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -437,11 +442,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -449,9 +455,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -459,9 +466,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -469,9 +477,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -487,12 +496,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -502,12 +512,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -521,9 +532,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip

+ 43 - 31
packages/x11/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -67,41 +67,43 @@ endif
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -189,11 +191,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -343,56 +346,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -436,11 +441,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -448,9 +454,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -458,9 +465,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -468,9 +476,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -486,12 +495,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -501,12 +511,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -520,9 +531,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip

+ 43 - 31
packages/zlib/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -67,41 +67,43 @@ endif
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -190,11 +192,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -348,56 +351,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -441,11 +446,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -453,9 +459,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -463,9 +470,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -473,9 +481,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -491,12 +500,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -506,12 +516,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -525,9 +536,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip

+ 11 - 9
rtl/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -67,41 +67,43 @@ endif
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################

+ 43 - 31
rtl/go32v1/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -74,41 +74,43 @@ override CPU_TARGET:=i386
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -235,11 +237,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -399,56 +402,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -492,11 +497,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -504,9 +510,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -514,9 +521,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -524,9 +532,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -542,12 +551,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -557,12 +567,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -576,9 +587,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip

+ 43 - 31
rtl/go32v2/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -74,41 +74,43 @@ override CPU_TARGET:=i386
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -235,11 +237,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -399,56 +402,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -492,11 +497,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -504,9 +510,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -514,9 +521,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -524,9 +532,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -542,12 +551,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -557,12 +567,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -576,9 +587,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip

+ 43 - 31
rtl/linux/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -74,41 +74,43 @@ override CPU_TARGET:=i386
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -246,11 +248,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -410,56 +413,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -503,11 +508,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -515,9 +521,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -525,9 +532,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -535,9 +543,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -553,12 +562,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -568,12 +578,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -587,9 +598,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip

+ 43 - 31
rtl/os2/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -74,41 +74,43 @@ override CPU_TARGET:=i386
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -235,11 +237,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -399,56 +402,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -492,11 +497,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -504,9 +510,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -514,9 +521,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -524,9 +532,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -542,12 +551,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -557,12 +567,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -576,9 +587,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip

+ 43 - 31
rtl/win32/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -74,41 +74,43 @@ override CPU_TARGET:=i386
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -240,11 +242,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -404,56 +407,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -497,11 +502,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -509,9 +515,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -519,9 +526,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -529,9 +537,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -547,12 +556,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -562,12 +572,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -581,9 +592,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip

+ 11 - 9
tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: info
@@ -67,41 +67,43 @@ endif
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################

+ 45 - 32
utils/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -67,41 +67,43 @@ endif
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -195,11 +197,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -358,56 +361,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -451,11 +456,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -463,9 +469,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -473,9 +480,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -483,9 +491,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # data2inc
 ifndef DATA2INC
@@ -493,9 +502,10 @@ DATA2INC:=$(strip $(wildcard $(addsuffix /data2inc$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(DATA2INC),)
 DATA2INC=
 else
-export DATA2INC:=$(firstword $(DATA2INC))
+DATA2INC:=$(firstword $(DATA2INC))
 endif
 endif
+export DATA2INC
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -511,12 +521,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -526,12 +537,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -545,9 +557,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip

+ 54 - 37
utils/fpcmake.ini

@@ -72,41 +72,43 @@ endif
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 
 [defaultsettings]
 #####################################################################
@@ -162,11 +164,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -245,18 +248,20 @@ endif
 # On linux, try to find where libgcc.a is.
 ifdef inlinux
 ifndef GCCLIBDIR
-export GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`)
+GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`)
 endif
 endif
+export GCCLIBDIR
 
 
 [dir_otherlib]
 # Where to find other libraries
 ifdef inlinux
 ifndef OTHERLIBDIR
-export OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }')
+OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }')
 endif
 endif
+export OTHERLIBDIR
 
 
 [command_begin]
@@ -392,56 +397,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 
 [tool_default]
 #####################################################################
@@ -487,12 +494,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
-
+export ECHO
 
 [tool_ppdep]
 # ppdep
@@ -501,9 +508,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 [tool_ppumove]
 # ppumove
@@ -512,9 +520,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 [tool_ppufiles]
 # ppufiles
@@ -523,9 +532,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 [tool_data2inc]
 # data2inc
@@ -534,9 +544,10 @@ DATA2INC:=$(strip $(wildcard $(addsuffix /data2inc$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(DATA2INC),)
 DATA2INC=
 else
-export DATA2INC:=$(firstword $(DATA2INC))
+DATA2INC:=$(firstword $(DATA2INC))
 endif
 endif
+export DATA2INC
 
 [tool_diff]
 # diff
@@ -545,9 +556,10 @@ DIFF:=$(strip $(wildcard $(addsuffix /diff$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(DIFF),)
 DIFF=
 else
-export DIFF:=$(firstword $(DIFF))
+DIFF:=$(firstword $(DIFF))
 endif
 endif
+export DIFF
 
 [tool_cmp]
 # cmp
@@ -556,9 +568,10 @@ CMP:=$(strip $(wildcard $(addsuffix /cmp$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(CMP),)
 CMP=
 else
-export CMP:=$(firstword $(CMP))
+CMP:=$(firstword $(CMP))
 endif
 endif
+export CMP
 
 [tool_sed]
 # Sed
@@ -567,9 +580,10 @@ SED:=$(strip $(wildcard $(addsuffix /sed$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(SED),)
 SED=
 else
-export SED:=$(firstword $(SED))
+SED:=$(firstword $(SED))
 endif
 endif
+export SED
 
 [tool_upx]
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
@@ -586,12 +600,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 [tool_date]
 # gdate/date
@@ -602,12 +617,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -622,9 +638,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip

+ 43 - 31
utils/h2pas/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -67,41 +67,43 @@ endif
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -191,11 +193,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -349,56 +352,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -442,11 +447,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -454,9 +460,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -464,9 +471,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -474,9 +482,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -492,12 +501,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -507,12 +517,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -526,9 +537,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip

+ 43 - 31
utils/simulator/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -67,41 +67,43 @@ endif
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -190,11 +192,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -344,56 +347,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -437,11 +442,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -449,9 +455,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -459,9 +466,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -469,9 +477,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -487,12 +496,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -502,12 +512,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -521,9 +532,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip

+ 43 - 31
utils/tply/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-24 16:08
 #
 
 defaultrule: all
@@ -67,41 +67,43 @@ endif
 ifndef FPC
 # Compatibility with old makefiles
 ifdef PP
-export FPC=$(PP)
+FPC=$(PP)
 else
 ifdef inOS2
-export FPC=ppos2$(EXEEXT)
+FPC=ppos2$(EXEEXT)
 else
-export FPC=ppc386$(EXEEXT)
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 
 # Target OS
 ifndef OS_TARGET
-export OS_TARGET:=$(shell $(FPC) -iTO)
+OS_TARGET:=$(shell $(FPC) -iTO)
 endif
 
 # Source OS
 ifndef OS_SOURCE
-export OS_SOURCE:=$(shell $(FPC) -iSO)
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 
 # Target CPU
 ifndef CPU_TARGET
-export CPU_TARGET:=$(shell $(FPC) -iTP)
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 
 # Source CPU
 ifndef CPU_SOURCE
-export CPU_SOURCE:=$(shell $(FPC) -iSP)
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 
 # FPC version
 ifndef FPC_VERSION
-export FPC_VERSION:=$(shell $(FPC) -iV)
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+
 #####################################################################
 # Default Settings
 #####################################################################
@@ -201,11 +203,12 @@ endif
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
-export PREFIXINSTALLDIR=/usr
+PREFIXINSTALLDIR=/usr
 else
-export PREFIXINSTALLDIR=/pp
+PREFIXINSTALLDIR=/pp
 endif
 endif
+export PREFIXINSTALLDIR
 
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
@@ -359,56 +362,58 @@ override COMPILER:=$(FPC) $(FPCOPT)
 
 # To copy pograms
 ifndef COPY
-export COPY:=cp -fp
+COPY:=cp -fp
 endif
 
 # Copy a whole tree
 ifndef COPYTREE
-export COPYTREE:=cp -rfp
+COPYTREE:=cp -rfp
 endif
 
 # To move pograms
 ifndef MOVE
-export MOVE:=mv -f
+MOVE:=mv -f
 endif
 
 # Check delete program
 ifndef DEL
-export DEL:=rm -f
+DEL:=rm -f
 endif
 
 # Check deltree program
 ifndef DELTREE
-export DELTREE:=rm -rf
+DELTREE:=rm -rf
 endif
 
 # To install files
 ifndef INSTALL
 ifdef inlinux
-export INSTALL:=install -m 644
+INSTALL:=install -m 644
 else
-export INSTALL:=$(COPY)
+INSTALL:=$(COPY)
 endif
 endif
 
 # To install programs
 ifndef INSTALLEXE
 ifdef inlinux
-export INSTALLEXE:=install -m 755
+INSTALLEXE:=install -m 755
 else
-export INSTALLEXE:=$(COPY)
+INSTALLEXE:=$(COPY)
 endif
 endif
 
 # To make a directory.
 ifndef MKDIR
 ifdef inlinux
-export MKDIR:=install -m 755 -d
+MKDIR:=install -m 755 -d
 else
-export MKDIR:=ginstall -m 755 -d
+MKDIR:=ginstall -m 755 -d
 endif
 endif
 
+export COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
 #####################################################################
 # Default Tools
 #####################################################################
@@ -452,11 +457,12 @@ endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-export ECHO:=echo
+ECHO:=echo
 else
-export ECHO:=$(firstword $(ECHO))
+ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
 
 # ppdep
 ifndef PPDEP
@@ -464,9 +470,10 @@ PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPDEP),)
 PPDEP=
 else
-export PPDEP:=$(firstword $(PPDEP))
+PPDEP:=$(firstword $(PPDEP))
 endif
 endif
+export PPDEP
 
 # ppumove
 ifndef PPUMOVE
@@ -474,9 +481,10 @@ PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
 PPUMOVE=
 else
-export PPUMOVE:=$(firstword $(PPUMOVE))
+PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
+export PPUMOVE
 
 # ppufiles
 ifndef PPUFILES
@@ -484,9 +492,10 @@ PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUFILES),)
 PPUFILES=
 else
-export PPUFILES:=$(firstword $(PPUFILES))
+PPUFILES:=$(firstword $(PPUFILES))
 endif
 endif
+export PPUFILES
 
 # Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
 # upx uses that one itself (PFV)
@@ -502,12 +511,13 @@ UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPXPROG),)
 UPXPROG=
 else
-export UPXPROG:=$(firstword $(UPXPROG))
+UPXPROG:=$(firstword $(UPXPROG))
 endif
 else
 UPXPROG=
 endif
 endif
+export UPXPROG
 
 # gdate/date
 ifndef DATE
@@ -517,12 +527,13 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
 ifeq ($(DATE),)
 DATE=
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 else
-export DATE:=$(firstword $(DATE))
+DATE:=$(firstword $(DATE))
 endif
 endif
+export DATE
 
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
@@ -536,9 +547,10 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
+export ZIPPROG
 
 ifndef ZIPEXT
 ZIPEXT=.zip