Browse Source

* regenerated

peter 24 years ago
parent
commit
b34e51e7f6
85 changed files with 1686 additions and 383 deletions
  1. 18 2
      compiler/Makefile
  2. 18 2
      compiler/new/Makefile
  3. 18 3
      compiler/utils/Makefile
  4. 15 2
      demo/Makefile
  5. 18 3
      demo/graph/Makefile
  6. 18 3
      demo/linux/Makefile
  7. 18 3
      demo/modex/Makefile
  8. 18 3
      demo/os2/Makefile
  9. 18 3
      demo/text/Makefile
  10. 18 3
      demo/win32/Makefile
  11. 20 3
      fcl/Makefile
  12. 18 3
      fcl/db/Makefile
  13. 18 3
      fcl/db/dbase/Makefile
  14. 19 3
      fcl/db/interbase/Makefile
  15. 19 3
      fcl/db/mysql/Makefile
  16. 20 3
      fcl/db/tests/Makefile
  17. 18 3
      fcl/shedit/Makefile
  18. 22 3
      fcl/shedit/gtk/Makefile
  19. 20 3
      fcl/tests/Makefile
  20. 18 3
      fcl/xml/Makefile
  21. 20 4
      fv/Makefile
  22. 1 1
      fv/Makefile.fpc
  23. 46 30
      fv/test/Makefile
  24. 1 1
      fv/test/Makefile.fpc
  25. 20 4
      fvision/Makefile
  26. 1 1
      fvision/Makefile.fpc
  27. 46 30
      fvision/test/Makefile
  28. 1 1
      fvision/test/Makefile.fpc
  29. 21 3
      ide/Makefile
  30. 18 3
      ide/compiler/Makefile
  31. 18 3
      ide/fakegdb/Makefile
  32. 20 3
      install/fpinst/Makefile
  33. 14 2
      packages/Makefile
  34. 19 3
      packages/cmem/Makefile
  35. 20 3
      packages/forms/Makefile
  36. 20 3
      packages/forms/demo/Makefile
  37. 19 3
      packages/gdbint/Makefile
  38. 14 2
      packages/gdbint/libgdb/Makefile
  39. 14 2
      packages/gdbm/Makefile
  40. 19 3
      packages/ggi/Makefile
  41. 20 3
      packages/gtk/Makefile
  42. 20 3
      packages/gtk/examples/Makefile
  43. 18 2
      packages/gtk/examples/tutorial/Makefile
  44. 19 3
      packages/gtk/gtkgl/Makefile
  45. 19 3
      packages/ibase/Makefile
  46. 19 3
      packages/inet/Makefile
  47. 19 3
      packages/libgd/Makefile
  48. 20 3
      packages/libpng/Makefile
  49. 19 3
      packages/mysql/Makefile
  50. 19 3
      packages/ncurses/Makefile
  51. 19 3
      packages/opengl/Makefile
  52. 20 3
      packages/opengl/build/Makefile
  53. 19 3
      packages/opengl/examples/Makefile
  54. 19 3
      packages/oracle/Makefile
  55. 21 3
      packages/oracle/example/Makefile
  56. 19 3
      packages/paszlib/Makefile
  57. 19 3
      packages/postgres/Makefile
  58. 19 3
      packages/regexpr/Makefile
  59. 19 3
      packages/svgalib/Makefile
  60. 19 3
      packages/syslog/Makefile
  61. 19 3
      packages/uncgi/Makefile
  62. 19 3
      packages/unzip/Makefile
  63. 19 3
      packages/utmp/Makefile
  64. 19 3
      packages/x11/Makefile
  65. 19 3
      packages/zlib/Makefile
  66. 16 3
      rtl/Makefile
  67. 15 3
      rtl/amiga/Makefile
  68. 15 3
      rtl/beos/Makefile
  69. 15 3
      rtl/freebsd/Makefile
  70. 15 3
      rtl/go32v1/Makefile
  71. 15 3
      rtl/go32v2/Makefile
  72. 6 3
      rtl/go32v2/exceptn.as
  73. 9 2
      rtl/inc/text.inc
  74. 15 3
      rtl/linux/Makefile
  75. 15 3
      rtl/os2/Makefile
  76. 186 92
      rtl/win32/Makefile
  77. 14 2
      tests/Makefile
  78. 18 3
      tests/units/Makefile
  79. 21 3
      utils/Makefile
  80. 18 3
      utils/dxegen/Makefile
  81. 20 3
      utils/fpcm/Makefile
  82. 18 3
      utils/fprcp/Makefile
  83. 18 3
      utils/h2pas/Makefile
  84. 18 3
      utils/simulator/Makefile
  85. 18 3
      utils/tply/Makefile

+ 18 - 2
compiler/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -426,6 +426,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -479,6 +485,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -486,6 +495,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -605,6 +617,9 @@ endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -706,7 +721,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -789,6 +804,7 @@ ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
 	$(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1
+	$(MKDIR) $(DIST_DESTDIR)
 	$(DEL) $(ZIPDESTFILE)
 ifdef USEZIPWRAPPER
 ifneq ($(ECHOREDIR),echo)

+ 18 - 2
compiler/new/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -425,6 +425,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -478,6 +484,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -485,6 +494,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -604,6 +616,9 @@ endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -705,7 +720,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -788,6 +803,7 @@ ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
 	$(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1
+	$(MKDIR) $(DIST_DESTDIR)
 	$(DEL) $(ZIPDESTFILE)
 ifdef USEZIPWRAPPER
 ifneq ($(ECHOREDIR),echo)

+ 18 - 3
compiler/utils/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -368,6 +368,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -421,6 +427,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -428,6 +437,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -547,6 +559,9 @@ endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -648,7 +663,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -732,7 +747,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG

+ 15 - 2
demo/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -369,6 +369,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -422,6 +428,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -429,6 +438,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -597,7 +609,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -680,6 +692,7 @@ ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
 	$(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1
+	$(MKDIR) $(DIST_DESTDIR)
 	$(DEL) $(ZIPDESTFILE)
 ifdef USEZIPWRAPPER
 ifneq ($(ECHOREDIR),echo)

+ 18 - 3
demo/graph/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -367,6 +367,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -420,6 +426,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -427,6 +436,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -546,6 +558,9 @@ endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -647,7 +662,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -739,7 +754,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG

+ 18 - 3
demo/linux/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -365,6 +365,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -418,6 +424,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -425,6 +434,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -544,6 +556,9 @@ endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -645,7 +660,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -729,7 +744,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG

+ 18 - 3
demo/modex/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -365,6 +365,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -418,6 +424,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -425,6 +434,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -544,6 +556,9 @@ endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -645,7 +660,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -729,7 +744,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG

+ 18 - 3
demo/os2/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -365,6 +365,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -418,6 +424,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -425,6 +434,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -544,6 +556,9 @@ endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -645,7 +660,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -729,7 +744,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG

+ 18 - 3
demo/text/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -363,6 +363,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -416,6 +422,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -423,6 +432,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -542,6 +554,9 @@ endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -643,7 +658,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -727,7 +742,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG

+ 18 - 3
demo/win32/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -365,6 +365,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -418,6 +424,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -425,6 +434,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -544,6 +556,9 @@ endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -645,7 +660,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -729,7 +744,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG

+ 20 - 3
fcl/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -388,6 +388,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -441,6 +447,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -448,6 +457,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -590,6 +602,10 @@ ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_PASZLIB=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
@@ -801,7 +817,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -902,7 +918,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG
@@ -1001,6 +1017,7 @@ ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
 	$(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1
+	$(MKDIR) $(DIST_DESTDIR)
 	$(DEL) $(ZIPDESTFILE)
 ifdef USEZIPWRAPPER
 ifneq ($(ECHOREDIR),echo)

+ 18 - 3
fcl/db/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -378,6 +378,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -431,6 +437,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -438,6 +447,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -572,6 +584,9 @@ endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -727,7 +742,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -828,7 +843,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG

+ 18 - 3
fcl/db/dbase/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -368,6 +368,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -421,6 +427,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -428,6 +437,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -547,6 +559,9 @@ endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -648,7 +663,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -743,7 +758,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG

+ 19 - 3
fcl/db/interbase/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -368,6 +368,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -421,6 +427,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -428,6 +437,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -562,6 +574,10 @@ ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_IBASE=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_IBASE=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_IBASE=1
@@ -692,7 +708,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -793,7 +809,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG

+ 19 - 3
fcl/db/mysql/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -368,6 +368,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -421,6 +427,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -428,6 +437,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -562,6 +574,10 @@ ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_MYSQL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_MYSQL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_MYSQL=1
@@ -692,7 +708,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -793,7 +809,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG

+ 20 - 3
fcl/db/tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -365,6 +365,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -418,6 +424,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -425,6 +434,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -573,6 +585,11 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
@@ -813,7 +830,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -903,7 +920,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG

+ 18 - 3
fcl/shedit/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -368,6 +368,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -421,6 +427,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -428,6 +437,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -547,6 +559,9 @@ endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -648,7 +663,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -743,7 +758,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG

+ 22 - 3
fcl/shedit/gtk/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -365,6 +365,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -418,6 +424,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -425,6 +434,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -587,6 +599,13 @@ REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_GTK=1
 REQUIRE_PACKAGES_OPENGL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL=1
+REQUIRE_PACKAGES_GTK=1
+REQUIRE_PACKAGES_OPENGL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
@@ -912,7 +931,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -1010,7 +1029,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG

+ 20 - 3
fcl/tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -371,6 +371,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -424,6 +430,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -431,6 +440,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -579,6 +591,11 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
@@ -819,7 +836,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -909,7 +926,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG

+ 18 - 3
fcl/xml/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -367,6 +367,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -420,6 +426,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -427,6 +436,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -546,6 +558,9 @@ endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -647,7 +662,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -727,7 +742,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG

+ 20 - 4
fv/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -133,7 +133,7 @@ endif
 endif
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
-override PACKAGE_NAME=fv
+override PACKAGE_NAME=fvision
 override PACKAGE_VERSION=1.0.5
 override TARGET_UNITS+=buildfv
 override TARGET_EXAMPLEDIRS+=test
@@ -370,6 +370,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -423,6 +429,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -430,6 +439,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -549,6 +561,9 @@ endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -650,7 +665,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -745,7 +760,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG
@@ -844,6 +859,7 @@ ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
 	$(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1
+	$(MKDIR) $(DIST_DESTDIR)
 	$(DEL) $(ZIPDESTFILE)
 ifdef USEZIPWRAPPER
 ifneq ($(ECHOREDIR),echo)

+ 1 - 1
fv/Makefile.fpc

@@ -3,7 +3,7 @@
 #
 
 [package]
-name=fv
+name=fvision
 version=1.0.5
 
 [target]

+ 46 - 30
fv/test/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -363,6 +363,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -416,6 +422,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -423,6 +432,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -526,35 +538,39 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifeq ($(OS_TARGET),linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_FV=1
+REQUIRE_PACKAGES_FVISION=1
 endif
 ifeq ($(OS_TARGET),go32v2)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_FV=1
+REQUIRE_PACKAGES_FVISION=1
 endif
 ifeq ($(OS_TARGET),win32)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_FV=1
+REQUIRE_PACKAGES_FVISION=1
 endif
 ifeq ($(OS_TARGET),os2)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_FV=1
+REQUIRE_PACKAGES_FVISION=1
 endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_FV=1
+REQUIRE_PACKAGES_FVISION=1
 endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_FV=1
+REQUIRE_PACKAGES_FVISION=1
+endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FVISION=1
 endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_FV=1
+REQUIRE_PACKAGES_FVISION=1
 endif
 ifeq ($(OS_TARGET),atari)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_FV=1
+REQUIRE_PACKAGES_FVISION=1
 endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
@@ -583,34 +599,34 @@ ifdef UNITDIR_RTL
 override COMPILER_UNITDIR+=$(UNITDIR_RTL)
 endif
 endif
-ifdef REQUIRE_PACKAGES_FV
-PACKAGEDIR_FV:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fv/Makefile.fpc,$(PACKAGESDIR)))))
-ifneq ($(PACKAGEDIR_FV),)
-PACKAGEDIR_FV:=$(firstword $(PACKAGEDIR_FV))
-ifeq ($(wildcard $(PACKAGEDIR_FV)/$(FPCMADE)),)
-override COMPILEPACKAGES+=package_fv
-package_fv:
-	$(MAKE) -C $(PACKAGEDIR_FV) all
+ifdef REQUIRE_PACKAGES_FVISION
+PACKAGEDIR_FVISION:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fvision/Makefile.fpc,$(PACKAGESDIR)))))
+ifneq ($(PACKAGEDIR_FVISION),)
+PACKAGEDIR_FVISION:=$(firstword $(PACKAGEDIR_FVISION))
+ifeq ($(wildcard $(PACKAGEDIR_FVISION)/$(FPCMADE)),)
+override COMPILEPACKAGES+=package_fvision
+package_fvision:
+	$(MAKE) -C $(PACKAGEDIR_FVISION) all
 endif
-ifneq ($(wildcard $(PACKAGEDIR_FV)/$(OS_TARGET)),)
-UNITDIR_FV=$(PACKAGEDIR_FV)/$(OS_TARGET)
+ifneq ($(wildcard $(PACKAGEDIR_FVISION)/$(OS_TARGET)),)
+UNITDIR_FVISION=$(PACKAGEDIR_FVISION)/$(OS_TARGET)
 else
-UNITDIR_FV=$(PACKAGEDIR_FV)
+UNITDIR_FVISION=$(PACKAGEDIR_FVISION)
 endif
 else
-PACKAGEDIR_FV=
-UNITDIR_FV:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fv/Package.fpc,$(UNITSDIR)))))
-ifneq ($(UNITDIR_FV),)
-UNITDIR_FV:=$(firstword $(UNITDIR_FV))
+PACKAGEDIR_FVISION=
+UNITDIR_FVISION:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fvision/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_FVISION),)
+UNITDIR_FVISION:=$(firstword $(UNITDIR_FVISION))
 else
-UNITDIR_FV=
+UNITDIR_FVISION=
 endif
 endif
-ifdef UNITDIR_FV
-override COMPILER_UNITDIR+=$(UNITDIR_FV)
+ifdef UNITDIR_FVISION
+override COMPILER_UNITDIR+=$(UNITDIR_FVISION)
 endif
 endif
-.PHONY: package_rtl package_fv
+.PHONY: package_rtl package_fvision
 override FPCOPTDEF=$(CPU_TARGET)
 ifneq ($(OS_TARGET),$(OS_SOURCE))
 override FPCOPT+=-T$(OS_TARGET)
@@ -678,7 +694,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -762,7 +778,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG

+ 1 - 1
fv/test/Makefile.fpc

@@ -6,7 +6,7 @@
 programs=tfileio testapp
 
 [require]
-packages=fv
+packages=fvision
 
 [default]
 fpcdir=../..

+ 20 - 4
fvision/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -133,7 +133,7 @@ endif
 endif
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
-override PACKAGE_NAME=fv
+override PACKAGE_NAME=fvision
 override PACKAGE_VERSION=1.0.5
 override TARGET_UNITS+=buildfv
 override TARGET_EXAMPLEDIRS+=test
@@ -370,6 +370,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -423,6 +429,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -430,6 +439,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -549,6 +561,9 @@ endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -650,7 +665,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -745,7 +760,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG
@@ -844,6 +859,7 @@ ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
 	$(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1
+	$(MKDIR) $(DIST_DESTDIR)
 	$(DEL) $(ZIPDESTFILE)
 ifdef USEZIPWRAPPER
 ifneq ($(ECHOREDIR),echo)

+ 1 - 1
fvision/Makefile.fpc

@@ -3,7 +3,7 @@
 #
 
 [package]
-name=fv
+name=fvision
 version=1.0.5
 
 [target]

+ 46 - 30
fvision/test/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -363,6 +363,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -416,6 +422,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -423,6 +432,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -526,35 +538,39 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifeq ($(OS_TARGET),linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_FV=1
+REQUIRE_PACKAGES_FVISION=1
 endif
 ifeq ($(OS_TARGET),go32v2)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_FV=1
+REQUIRE_PACKAGES_FVISION=1
 endif
 ifeq ($(OS_TARGET),win32)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_FV=1
+REQUIRE_PACKAGES_FVISION=1
 endif
 ifeq ($(OS_TARGET),os2)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_FV=1
+REQUIRE_PACKAGES_FVISION=1
 endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_FV=1
+REQUIRE_PACKAGES_FVISION=1
 endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_FV=1
+REQUIRE_PACKAGES_FVISION=1
+endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FVISION=1
 endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_FV=1
+REQUIRE_PACKAGES_FVISION=1
 endif
 ifeq ($(OS_TARGET),atari)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_FV=1
+REQUIRE_PACKAGES_FVISION=1
 endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
@@ -583,34 +599,34 @@ ifdef UNITDIR_RTL
 override COMPILER_UNITDIR+=$(UNITDIR_RTL)
 endif
 endif
-ifdef REQUIRE_PACKAGES_FV
-PACKAGEDIR_FV:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fv/Makefile.fpc,$(PACKAGESDIR)))))
-ifneq ($(PACKAGEDIR_FV),)
-PACKAGEDIR_FV:=$(firstword $(PACKAGEDIR_FV))
-ifeq ($(wildcard $(PACKAGEDIR_FV)/$(FPCMADE)),)
-override COMPILEPACKAGES+=package_fv
-package_fv:
-	$(MAKE) -C $(PACKAGEDIR_FV) all
+ifdef REQUIRE_PACKAGES_FVISION
+PACKAGEDIR_FVISION:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fvision/Makefile.fpc,$(PACKAGESDIR)))))
+ifneq ($(PACKAGEDIR_FVISION),)
+PACKAGEDIR_FVISION:=$(firstword $(PACKAGEDIR_FVISION))
+ifeq ($(wildcard $(PACKAGEDIR_FVISION)/$(FPCMADE)),)
+override COMPILEPACKAGES+=package_fvision
+package_fvision:
+	$(MAKE) -C $(PACKAGEDIR_FVISION) all
 endif
-ifneq ($(wildcard $(PACKAGEDIR_FV)/$(OS_TARGET)),)
-UNITDIR_FV=$(PACKAGEDIR_FV)/$(OS_TARGET)
+ifneq ($(wildcard $(PACKAGEDIR_FVISION)/$(OS_TARGET)),)
+UNITDIR_FVISION=$(PACKAGEDIR_FVISION)/$(OS_TARGET)
 else
-UNITDIR_FV=$(PACKAGEDIR_FV)
+UNITDIR_FVISION=$(PACKAGEDIR_FVISION)
 endif
 else
-PACKAGEDIR_FV=
-UNITDIR_FV:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fv/Package.fpc,$(UNITSDIR)))))
-ifneq ($(UNITDIR_FV),)
-UNITDIR_FV:=$(firstword $(UNITDIR_FV))
+PACKAGEDIR_FVISION=
+UNITDIR_FVISION:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fvision/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_FVISION),)
+UNITDIR_FVISION:=$(firstword $(UNITDIR_FVISION))
 else
-UNITDIR_FV=
+UNITDIR_FVISION=
 endif
 endif
-ifdef UNITDIR_FV
-override COMPILER_UNITDIR+=$(UNITDIR_FV)
+ifdef UNITDIR_FVISION
+override COMPILER_UNITDIR+=$(UNITDIR_FVISION)
 endif
 endif
-.PHONY: package_rtl package_fv
+.PHONY: package_rtl package_fvision
 override FPCOPTDEF=$(CPU_TARGET)
 ifneq ($(OS_TARGET),$(OS_SOURCE))
 override FPCOPT+=-T$(OS_TARGET)
@@ -678,7 +694,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -762,7 +778,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG

+ 1 - 1
fvision/test/Makefile.fpc

@@ -6,7 +6,7 @@
 programs=tfileio testapp
 
 [require]
-packages=fv
+packages=fvision
 
 [default]
 fpcdir=../..

+ 21 - 3
ide/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -418,6 +418,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -471,6 +477,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -478,6 +487,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -618,6 +630,11 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_GDBINT=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FV=1
+REQUIRE_PACKAGES_GDBINT=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_FV=1
@@ -777,7 +794,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -867,7 +884,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG
@@ -966,6 +983,7 @@ ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
 	$(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1
+	$(MKDIR) $(DIST_DESTDIR)
 	$(DEL) $(ZIPDESTFILE)
 ifdef USEZIPWRAPPER
 ifneq ($(ECHOREDIR),echo)

+ 18 - 3
ide/compiler/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -378,6 +378,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -431,6 +437,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -438,6 +447,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -557,6 +569,9 @@ endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -658,7 +673,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -738,7 +753,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG

+ 18 - 3
ide/fakegdb/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -363,6 +363,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -416,6 +422,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -423,6 +432,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -542,6 +554,9 @@ endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -643,7 +658,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -723,7 +738,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG

+ 20 - 3
install/fpinst/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -385,6 +385,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -438,6 +444,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -445,6 +454,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -570,6 +582,10 @@ ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_FV=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FV=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_FV=1
@@ -700,7 +716,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -784,7 +800,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG
@@ -883,6 +899,7 @@ ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
 	$(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1
+	$(MKDIR) $(DIST_DESTDIR)
 	$(DEL) $(ZIPDESTFILE)
 ifdef USEZIPWRAPPER
 ifneq ($(ECHOREDIR),echo)

+ 14 - 2
packages/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -378,6 +378,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -431,6 +437,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -438,6 +447,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -606,7 +618,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR

+ 19 - 3
packages/cmem/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -367,6 +367,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -420,6 +426,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -427,6 +436,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -546,6 +558,9 @@ endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -647,7 +662,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -742,7 +757,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG
@@ -841,6 +856,7 @@ ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
 	$(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1
+	$(MKDIR) $(DIST_DESTDIR)
 	$(DEL) $(ZIPDESTFILE)
 ifdef USEZIPWRAPPER
 ifneq ($(ECHOREDIR),echo)

+ 20 - 3
packages/forms/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -368,6 +368,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -421,6 +427,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -428,6 +437,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -562,6 +574,10 @@ ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_X11=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_X11=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_X11=1
@@ -692,7 +708,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -805,7 +821,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG
@@ -904,6 +920,7 @@ ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
 	$(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1
+	$(MKDIR) $(DIST_DESTDIR)
 	$(DEL) $(ZIPDESTFILE)
 ifdef USEZIPWRAPPER
 ifneq ($(ECHOREDIR),echo)

+ 20 - 3
packages/forms/demo/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -364,6 +364,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -417,6 +423,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -424,6 +433,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -564,6 +576,11 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_X11=1
 REQUIRE_PACKAGES_FORMS=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_X11=1
+REQUIRE_PACKAGES_FORMS=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_X11=1
@@ -723,7 +740,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -813,7 +830,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG

+ 19 - 3
packages/gdbint/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -369,6 +369,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -422,6 +428,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -429,6 +438,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -557,6 +569,9 @@ endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -658,7 +673,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -759,7 +774,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG
@@ -858,6 +873,7 @@ ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
 	$(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1
+	$(MKDIR) $(DIST_DESTDIR)
 	$(DEL) $(ZIPDESTFILE)
 ifdef USEZIPWRAPPER
 ifneq ($(ECHOREDIR),echo)

+ 14 - 2
packages/gdbint/libgdb/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -354,6 +354,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -407,6 +413,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -414,6 +423,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -582,7 +594,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR

+ 14 - 2
packages/gdbm/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -355,6 +355,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -408,6 +414,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -415,6 +424,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -583,7 +595,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR

+ 19 - 3
packages/ggi/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -367,6 +367,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -420,6 +426,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -427,6 +436,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -555,6 +567,9 @@ endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -656,7 +671,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -757,7 +772,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG
@@ -856,6 +871,7 @@ ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
 	$(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1
+	$(MKDIR) $(DIST_DESTDIR)
 	$(DEL) $(ZIPDESTFILE)
 ifdef USEZIPWRAPPER
 ifneq ($(ECHOREDIR),echo)

+ 20 - 3
packages/gtk/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -370,6 +370,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -423,6 +429,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -430,6 +439,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -566,6 +578,10 @@ ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_OPENGL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_OPENGL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_OPENGL=1
@@ -723,7 +739,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -824,7 +840,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG
@@ -923,6 +939,7 @@ ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
 	$(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1
+	$(MKDIR) $(DIST_DESTDIR)
 	$(DEL) $(ZIPDESTFILE)
 ifdef USEZIPWRAPPER
 ifneq ($(ECHOREDIR),echo)

+ 20 - 3
packages/gtk/examples/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -366,6 +366,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -419,6 +425,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -426,6 +435,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -568,6 +580,11 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_GTK=1
 REQUIRE_PACKAGES_OPENGL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_GTK=1
+REQUIRE_PACKAGES_OPENGL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_GTK=1
@@ -754,7 +771,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -844,7 +861,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG

+ 18 - 2
packages/gtk/examples/tutorial/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -363,6 +363,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -416,6 +422,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -423,6 +432,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -559,6 +571,10 @@ ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_GTK=1
 REQUIRE_PACKAGES_OPENGL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_GTK=1
+REQUIRE_PACKAGES_OPENGL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_GTK=1
 REQUIRE_PACKAGES_OPENGL=1
@@ -716,7 +732,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR

+ 19 - 3
packages/gtk/gtkgl/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -367,6 +367,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -420,6 +426,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -427,6 +436,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -563,6 +575,10 @@ ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_OPENGL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_OPENGL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_OPENGL=1
@@ -720,7 +736,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -821,7 +837,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG

+ 19 - 3
packages/ibase/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -367,6 +367,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -420,6 +426,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -427,6 +436,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -555,6 +567,9 @@ endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -656,7 +671,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -757,7 +772,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG
@@ -856,6 +871,7 @@ ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
 	$(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1
+	$(MKDIR) $(DIST_DESTDIR)
 	$(DEL) $(ZIPDESTFILE)
 ifdef USEZIPWRAPPER
 ifneq ($(ECHOREDIR),echo)

+ 19 - 3
packages/inet/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -367,6 +367,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -420,6 +426,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -427,6 +436,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -546,6 +558,9 @@ endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -647,7 +662,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -742,7 +757,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG
@@ -841,6 +856,7 @@ ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
 	$(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1
+	$(MKDIR) $(DIST_DESTDIR)
 	$(DEL) $(ZIPDESTFILE)
 ifdef USEZIPWRAPPER
 ifneq ($(ECHOREDIR),echo)

+ 19 - 3
packages/libgd/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -367,6 +367,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -420,6 +426,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -427,6 +436,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -555,6 +567,9 @@ endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -656,7 +671,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -757,7 +772,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG
@@ -856,6 +871,7 @@ ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
 	$(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1
+	$(MKDIR) $(DIST_DESTDIR)
 	$(DEL) $(ZIPDESTFILE)
 ifdef USEZIPWRAPPER
 ifneq ($(ECHOREDIR),echo)

+ 20 - 3
packages/libpng/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -366,6 +366,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -419,6 +425,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -426,6 +435,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -560,6 +572,10 @@ ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_ZLIB=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_ZLIB=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_ZLIB=1
@@ -690,7 +706,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -776,7 +792,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG
@@ -875,6 +891,7 @@ ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
 	$(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1
+	$(MKDIR) $(DIST_DESTDIR)
 	$(DEL) $(ZIPDESTFILE)
 ifdef USEZIPWRAPPER
 ifneq ($(ECHOREDIR),echo)

+ 19 - 3
packages/mysql/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -367,6 +367,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -420,6 +426,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -427,6 +436,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -555,6 +567,9 @@ endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -656,7 +671,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -757,7 +772,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG
@@ -856,6 +871,7 @@ ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
 	$(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1
+	$(MKDIR) $(DIST_DESTDIR)
 	$(DEL) $(ZIPDESTFILE)
 ifdef USEZIPWRAPPER
 ifneq ($(ECHOREDIR),echo)

+ 19 - 3
packages/ncurses/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -367,6 +367,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -420,6 +426,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -427,6 +436,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -555,6 +567,9 @@ endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -656,7 +671,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -757,7 +772,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG
@@ -856,6 +871,7 @@ ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
 	$(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1
+	$(MKDIR) $(DIST_DESTDIR)
 	$(DEL) $(ZIPDESTFILE)
 ifdef USEZIPWRAPPER
 ifneq ($(ECHOREDIR),echo)

+ 19 - 3
packages/opengl/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -384,6 +384,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -437,6 +443,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -444,6 +453,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -574,6 +586,9 @@ endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -702,7 +717,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -803,7 +818,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG
@@ -902,6 +917,7 @@ ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
 	$(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1
+	$(MKDIR) $(DIST_DESTDIR)
 	$(DEL) $(ZIPDESTFILE)
 ifdef USEZIPWRAPPER
 ifneq ($(ECHOREDIR),echo)

+ 20 - 3
packages/opengl/build/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all_units
 override PATH:=$(subst \,/,$(PATH))
@@ -365,6 +365,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -418,6 +424,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -425,6 +434,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -573,6 +585,11 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
@@ -813,7 +830,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -911,7 +928,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG

+ 19 - 3
packages/opengl/examples/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -364,6 +364,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -417,6 +423,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -424,6 +433,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -560,6 +572,10 @@ ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_OPENGL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_OPENGL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_OPENGL=1
@@ -717,7 +733,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -807,7 +823,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG

+ 19 - 3
packages/oracle/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -367,6 +367,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -420,6 +426,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -427,6 +436,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -555,6 +567,9 @@ endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -656,7 +671,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -757,7 +772,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG
@@ -856,6 +871,7 @@ ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
 	$(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1
+	$(MKDIR) $(DIST_DESTDIR)
 	$(DEL) $(ZIPDESTFILE)
 ifdef USEZIPWRAPPER
 ifneq ($(ECHOREDIR),echo)

+ 21 - 3
packages/oracle/example/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -365,6 +365,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -418,6 +424,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -425,6 +434,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -579,6 +591,12 @@ REQUIRE_PACKAGES_ORACLE=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_ORACLE=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_ORACLE=1
@@ -848,7 +866,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -949,7 +967,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG

+ 19 - 3
packages/paszlib/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -367,6 +367,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -420,6 +426,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -427,6 +436,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -546,6 +558,9 @@ endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -647,7 +662,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -742,7 +757,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG
@@ -841,6 +856,7 @@ ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
 	$(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1
+	$(MKDIR) $(DIST_DESTDIR)
 	$(DEL) $(ZIPDESTFILE)
 ifdef USEZIPWRAPPER
 ifneq ($(ECHOREDIR),echo)

+ 19 - 3
packages/postgres/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -367,6 +367,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -420,6 +426,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -427,6 +436,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -555,6 +567,9 @@ endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -656,7 +671,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -757,7 +772,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG
@@ -856,6 +871,7 @@ ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
 	$(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1
+	$(MKDIR) $(DIST_DESTDIR)
 	$(DEL) $(ZIPDESTFILE)
 ifdef USEZIPWRAPPER
 ifneq ($(ECHOREDIR),echo)

+ 19 - 3
packages/regexpr/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -368,6 +368,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -421,6 +427,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -428,6 +437,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -547,6 +559,9 @@ endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -648,7 +663,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -743,7 +758,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG
@@ -842,6 +857,7 @@ ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
 	$(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1
+	$(MKDIR) $(DIST_DESTDIR)
 	$(DEL) $(ZIPDESTFILE)
 ifdef USEZIPWRAPPER
 ifneq ($(ECHOREDIR),echo)

+ 19 - 3
packages/svgalib/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -367,6 +367,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -420,6 +426,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -427,6 +436,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -555,6 +567,9 @@ endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -656,7 +671,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -757,7 +772,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG
@@ -856,6 +871,7 @@ ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
 	$(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1
+	$(MKDIR) $(DIST_DESTDIR)
 	$(DEL) $(ZIPDESTFILE)
 ifdef USEZIPWRAPPER
 ifneq ($(ECHOREDIR),echo)

+ 19 - 3
packages/syslog/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -367,6 +367,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -420,6 +426,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -427,6 +436,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -555,6 +567,9 @@ endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -656,7 +671,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -757,7 +772,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG
@@ -856,6 +871,7 @@ ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
 	$(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1
+	$(MKDIR) $(DIST_DESTDIR)
 	$(DEL) $(ZIPDESTFILE)
 ifdef USEZIPWRAPPER
 ifneq ($(ECHOREDIR),echo)

+ 19 - 3
packages/uncgi/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -367,6 +367,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -420,6 +426,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -427,6 +436,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -546,6 +558,9 @@ endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -647,7 +662,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -742,7 +757,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG
@@ -841,6 +856,7 @@ ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
 	$(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1
+	$(MKDIR) $(DIST_DESTDIR)
 	$(DEL) $(ZIPDESTFILE)
 ifdef USEZIPWRAPPER
 ifneq ($(ECHOREDIR),echo)

+ 19 - 3
packages/unzip/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -369,6 +369,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -422,6 +428,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -429,6 +438,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -548,6 +560,9 @@ endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -649,7 +664,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -729,7 +744,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG
@@ -828,6 +843,7 @@ ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
 	$(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1
+	$(MKDIR) $(DIST_DESTDIR)
 	$(DEL) $(ZIPDESTFILE)
 ifdef USEZIPWRAPPER
 ifneq ($(ECHOREDIR),echo)

+ 19 - 3
packages/utmp/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -367,6 +367,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -420,6 +426,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -427,6 +436,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -546,6 +558,9 @@ endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -647,7 +662,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -742,7 +757,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG
@@ -841,6 +856,7 @@ ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
 	$(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1
+	$(MKDIR) $(DIST_DESTDIR)
 	$(DEL) $(ZIPDESTFILE)
 ifdef USEZIPWRAPPER
 ifneq ($(ECHOREDIR),echo)

+ 19 - 3
packages/x11/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -366,6 +366,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -419,6 +425,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -426,6 +435,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -554,6 +566,9 @@ endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -655,7 +670,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -741,7 +756,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG
@@ -840,6 +855,7 @@ ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
 	$(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1
+	$(MKDIR) $(DIST_DESTDIR)
 	$(DEL) $(ZIPDESTFILE)
 ifdef USEZIPWRAPPER
 ifneq ($(ECHOREDIR),echo)

+ 19 - 3
packages/zlib/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -366,6 +366,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -419,6 +425,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -426,6 +435,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -554,6 +566,9 @@ endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -655,7 +670,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -741,7 +756,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG
@@ -840,6 +855,7 @@ ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
 	$(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1
+	$(MKDIR) $(DIST_DESTDIR)
 	$(DEL) $(ZIPDESTFILE)
 ifdef USEZIPWRAPPER
 ifneq ($(ECHOREDIR),echo)

+ 16 - 3
rtl/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -387,6 +387,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -440,6 +446,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -447,6 +456,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -615,7 +627,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -662,7 +674,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG
@@ -761,6 +773,7 @@ ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
 	$(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1
+	$(MKDIR) $(DIST_DESTDIR)
 	$(DEL) $(ZIPDESTFILE)
 ifdef USEZIPWRAPPER
 ifneq ($(ECHOREDIR),echo)

+ 15 - 3
rtl/amiga/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -387,6 +387,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -440,6 +446,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -447,6 +456,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -615,7 +627,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -710,7 +722,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG

+ 15 - 3
rtl/beos/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -382,6 +382,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -435,6 +441,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -442,6 +451,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -610,7 +622,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -705,7 +717,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG

+ 15 - 3
rtl/freebsd/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -394,6 +394,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -447,6 +453,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -454,6 +463,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -622,7 +634,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -717,7 +729,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG

+ 15 - 3
rtl/go32v1/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -380,6 +380,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -433,6 +439,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -440,6 +449,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -608,7 +620,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -703,7 +715,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG

+ 15 - 3
rtl/go32v2/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -387,6 +387,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -440,6 +446,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -447,6 +456,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -615,7 +627,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -710,7 +722,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG

+ 6 - 3
rtl/go32v2/exceptn.as

@@ -359,7 +359,7 @@ Lkbd_chain:
 	popl	%ds
 	popl	%ebx
 	popl	%eax
-	ljmp	*%cs:___djgpp_old_kbd
+	ljmp	%cs:___djgpp_old_kbd
 
 	.balign 16,,7
 	.global	___djgpp_kbd_hdlr_pc98
@@ -411,7 +411,7 @@ ___djgpp_timer_hdlr:
    	.byte	0x2e				/* CS: */
 	testb	$4, ___djgpp_hwint_flags	/* IRET or chain? */
 	jne	2f
-	ljmp	*%cs:___djgpp_old_timer
+	ljmp	%cs:___djgpp_old_timer
 2:
 	pushl	%eax
 	movb	$0x20,%al			/* EOI the interrupt */
@@ -486,7 +486,10 @@ ___djgpp_hw_lock_end:
 
 /*
    $Log$
-   Revision 1.3  2001-08-19 21:02:01  florian
+   Revision 1.4  2001-08-22 20:49:18  peter
+     * regenerated
+
+   Revision 1.3  2001/08/19 21:02:01  florian
      * fixed and added a lot of stuff to get the Jedi DX( headers
        compiled
 

+ 9 - 2
rtl/inc/text.inc

@@ -875,8 +875,12 @@ End;
 
 
 Procedure Read_Array(var f : TextRec;var s : array of char);[Public,Alias:'FPC_READ_TEXT_PCHAR_AS_ARRAY'];
+var
+  len: longint;
 Begin
-  pchar(pchar(@s)+ReadPCharLen(f,pchar(@s),high(s)+1))^:=#0;
+  len := ReadPCharLen(f,pchar(@s),high(s)+1);
+  if len < high(s)+1 then
+    s[len] := #0;
 End;
 
 
@@ -1099,7 +1103,10 @@ end;
 
 {
   $Log$
-  Revision 1.12  2001-08-19 11:23:10  peter
+  Revision 1.13  2001-08-22 20:49:18  peter
+    * regenerated
+
+  Revision 1.12  2001/08/19 11:23:10  peter
     * read_array fix merged
 
   Revision 1.11  2001/07/21 15:53:28  jonas

+ 15 - 3
rtl/linux/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -400,6 +400,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -453,6 +459,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -460,6 +469,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -628,7 +640,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -723,7 +735,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG

+ 15 - 3
rtl/os2/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -386,6 +386,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -439,6 +445,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -446,6 +455,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -614,7 +626,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -709,7 +721,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG

+ 186 - 92
rtl/win32/Makefile

@@ -1,11 +1,11 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/08/14]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH:=$(subst :, ,$(PATH))
+SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH)))
 else
 SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
@@ -34,7 +34,7 @@ inOS2=1
 endif
 endif
 else
-ifneq ($(findstring cygwin,$(MACH_TYPE)),)
+ifneq ($(findstring cygwin,$(MACHTYPE)),)
 inCygWin=1
 endif
 endif
@@ -54,6 +54,13 @@ PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
 BASEDIR:=$(subst \,/,$(shell $(PWD)))
+ifdef inCygWin
+ifneq ($(findstring /cygdrive/,$(BASEDIR)),)
+BASENODIR:=$(patsubst /cygdrive%,%,$(BASEDIR))
+BASEDRIVE:=$(firstword $(subst /, ,$(BASENODIR)))
+BASEDIR:=$(subst /cygdrive/$(BASEDRIVE)/,$(BASEDRIVE):/,$(BASEDIR))
+endif
+endif
 else
 BASEDIR=.
 endif
@@ -62,9 +69,18 @@ ifndef FPC
 ifdef PP
 FPC=$(PP)
 else
+ifdef inUnix
+CPU_SOURCE=$(shell uname -m)
+ifeq (m68k,$(CPU_SOURCE))
+FPC=ppc68k
+else
+FPC=ppc386
+endif
+else
 FPC=ppc386
 endif
 endif
+endif
 override FPC:=$(subst $(SRCEXEEXT),,$(FPC))
 override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT)
 ifndef OS_TARGET
@@ -150,7 +166,7 @@ ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-ECHO:=echo
+ECHO=
 else
 ECHO:=$(firstword $(ECHO))
 endif
@@ -158,58 +174,98 @@ else
 ECHO:=$(firstword $(ECHO))
 endif
 endif
+export ECHO
+ifndef DATE
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(DATE),)
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(DATE),)
+DATE=
+else
+DATE:=$(firstword $(DATE))
+endif
+else
+DATE:=$(firstword $(DATE))
+endif
+endif
+export DATE
+ifndef GINSTALL
+GINSTALL:=$(strip $(wildcard $(addsuffix /ginstall$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(GINSTALL),)
+GINSTALL:=$(strip $(wildcard $(addsuffix /install$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(GINSTALL),)
+GINSTALL=
+else
+GINSTALL:=$(firstword $(GINSTALL))
+endif
+else
+GINSTALL:=$(firstword $(GINSTALL))
+endif
+endif
+export GINSTALL
+ifndef CPPROG
+CPPROG:=$(strip $(wildcard $(addsuffix /cp$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(CPPROG),)
+CPPROG=
+else
+CPPROG:=$(firstword $(CPPROG))
+endif
+endif
+export CPPROG
+ifndef RMPROG
+RMPROG:=$(strip $(wildcard $(addsuffix /rm$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(RMPROG),)
+RMPROG=
+else
+RMPROG:=$(firstword $(RMPROG))
+endif
+endif
+export RMPROG
+ifndef MVPROG
+MVPROG:=$(strip $(wildcard $(addsuffix /mv$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(MVPROG),)
+MVPROG=
+else
+MVPROG:=$(firstword $(MVPROG))
+endif
+endif
+export MVPROG
+ifndef ECHOREDIR
+ECHOREDIR:=$(subst /,$(PATHSEP),$(ECHO))
+endif
 ifndef COPY
-COPY:=cp -fp
+COPY:=$(CPPROG) -fp
 endif
 ifndef COPYTREE
-COPYTREE:=cp -rfp
+COPYTREE:=$(CPPROG) -rfp
 endif
 ifndef MOVE
-MOVE:=mv -f
+MOVE:=$(MVPROG) -f
 endif
 ifndef DEL
-DEL:=rm -f
+DEL:=$(RMPROG) -f
 endif
 ifndef DELTREE
-DELTREE:=rm -rf
+DELTREE:=$(RMPROG) -rf
 endif
 ifndef INSTALL
 ifdef inUnix
-INSTALL:=install -c -m 644
+INSTALL:=$(GINSTALL) -c -m 644
 else
 INSTALL:=$(COPY)
 endif
 endif
 ifndef INSTALLEXE
 ifdef inUnix
-INSTALLEXE:=install -c -m 755
+INSTALLEXE:=$(GINSTALL) -c -m 755
 else
 INSTALLEXE:=$(COPY)
 endif
 endif
 ifndef MKDIR
-ifdef inUnix
-MKDIR:=install -m 755 -d
-else
-MKDIR:=ginstall -m 755 -d
-endif
-endif
-export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
-ifndef AS
-AS=as
-endif
-ifndef LD
-LD=ld
-endif
-ifndef RC
-RC=rc
-endif
-PPAS=ppas$(BATCHEXT)
-ifdef inUnix
-LDCONFIG=ldconfig
-else
-LDCONFIG=
+MKDIR:=$(GINSTALL) -m 755 -d
 endif
+export ECHOREDIR COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -219,29 +275,48 @@ PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
 export PPUMOVE
-ifndef PPUFILES
-PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(SRCEXEEXT),$(SEARCHPATH))))
-ifeq ($(PPUFILES),)
-PPUFILES=
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
 else
-PPUFILES:=$(firstword $(PPUFILES))
+FPCMAKE:=$(firstword $(FPCMAKE))
 endif
 endif
-export PPUFILES
-ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
-ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
-ifeq ($(DATE),)
-DATE=
+export FPCMAKE
+ifndef ZIPPROG
+ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ZIPPROG),)
+ZIPPROG=
 else
-DATE:=$(firstword $(DATE))
+ZIPPROG:=$(firstword $(ZIPPROG))
 endif
+endif
+export ZIPPROG
+ifndef TARPROG
+TARPROG:=$(strip $(wildcard $(addsuffix /tar$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(TARPROG),)
+TARPROG=
 else
-DATE:=$(firstword $(DATE))
+TARPROG:=$(firstword $(TARPROG))
 endif
 endif
-export DATE
+export TARPROG
+ifndef AS
+AS=as
+endif
+ifndef LD
+LD=ld
+endif
+ifndef RC
+RC=rc
+endif
+PPAS=ppas$(BATCHEXT)
+ifdef inUnix
+LDCONFIG=ldconfig
+else
+LDCONFIG=
+endif
 ifdef DATE
 DATESTR:=$(shell $(DATE) +%Y%m%d)
 else
@@ -266,26 +341,8 @@ UPXPROG=
 endif
 endif
 export UPXPROG
-ifndef ZIPPROG
-ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(SRCEXEEXT),$(SEARCHPATH))))
-ifeq ($(ZIPPROG),)
-ZIPPROG=
-else
-ZIPPROG:=$(firstword $(ZIPPROG))
-endif
-endif
-export ZIPPROG
 ZIPOPT=-9
 ZIPEXT=.zip
-ifndef TARPROG
-TARPROG:=$(strip $(wildcard $(addsuffix /tar$(SRCEXEEXT),$(SEARCHPATH))))
-ifeq ($(TARPROG),)
-TARPROG=
-else
-TARPROG:=$(firstword $(TARPROG))
-endif
-endif
-export TARPROG
 ifeq ($(USETAR),bz2)
 TAROPT=vI
 TAREXT=.tar.bz2
@@ -302,7 +359,7 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.so
-LIBPREFIX=lib
+STATICLIBPREFIX=libp
 RSTEXT=.rst
 FPCMADE=fpcmade
 ifeq ($(OS_TARGET),go32v1)
@@ -312,12 +369,12 @@ ASMEXT=.s1
 SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
-LIBPREFIX=
+STATICLIBPREFIX=
 FPCMADE=fpcmade.v1
 PACKAGESUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
-LIBPREFIX=
+STATICLIBPREFIX=
 FPCMADE=fpcmade.dos
 ZIPSUFFIX=go32
 endif
@@ -333,6 +390,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -354,6 +417,25 @@ SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
 endif
+ifeq ($(OS_TARGET),amiga)
+EXEEXT=
+PPUEXT=.ppa
+ASMEXT=.asm
+OEXT=.o
+SMARTEXT=.sl
+STATICLIBEXT=.a
+SHAREDLIBEXT=.library
+FPCMADE=fpcmade.amg
+endif
+ifeq ($(OS_TARGET),atari)
+PPUEXT=.ppt
+ASMEXT=.s
+OEXT=.o
+SMARTEXT=.sl
+STATICLIBEXT=.a
+EXEEXT=.ttp
+FPCMADE=fpcmade.ata
+endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 endif
@@ -367,6 +449,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -374,6 +459,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -415,9 +503,11 @@ endif
 ifndef INSTALL_UNITDIR
 INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
 ifdef INSTALL_FPCPACKAGE
+ifdef PACKAGE_NAME
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
+endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
 INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
@@ -540,7 +630,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -557,9 +647,6 @@ endif
 ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
-ifeq ($(OS_SOURCE),win32)
-USEENV=1
-endif
 ifdef USEENV
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
@@ -602,7 +689,7 @@ override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_packages fpc_all fpc_smart fpc_debug
 $(FPCMADE): $(ALLTARGET)
-	@$(ECHO) Compiled > $(FPCMADE)
+	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_packages: $(COMPILEPACKAGES)
 fpc_all: fpc_packages $(FPCMADE)
 fpc_smart:
@@ -630,19 +717,15 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALLPPUFILES
-ifdef PPUFILES
-override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILES))
-override INSTALLPPULINKFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES)))
-else
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
 override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILES))
 override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPULINKFILES)))
-endif
+override INSTALL_CREATEPACKAGEFPC=1
 endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG
@@ -650,6 +733,17 @@ ifdef UPXPROG
 endif
 	$(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
 endif
+ifdef INSTALL_CREATEPACKAGEFPC
+ifdef FPCMAKE
+ifdef PACKAGE_VERSION
+ifneq ($(wildcard Makefile.fpc),)
+	$(FPCMAKE) -p -T$(OS_TARGET) Makefile.fpc
+	$(MKDIR) $(INSTALL_UNITDIR)
+	$(INSTALL) Package.fpc $(INSTALL_UNITDIR)
+endif
+endif
+endif
+endif
 ifdef INSTALLPPUFILES
 	$(MKDIR) $(INSTALL_UNITDIR)
 	$(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)
@@ -689,13 +783,9 @@ ifdef CLEAN_UNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))
 endif
 ifdef CLEANPPUFILES
+override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))
 override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILES))
-ifdef PPUFILES
-CLEANPPULINKFILES:=$(shell $(PPUFILES) $(CLEANPPUFILES))
-else
-CLEANPPULINKFILES:=$(wildcard $(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(addprefix $(LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))))
-endif
-override CLEANPPULINKFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILES))
+override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILES)))
 endif
 fpc_clean: $(CLEANTARGET)
 ifdef CLEANEXEFILES
@@ -716,7 +806,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
@@ -760,10 +850,14 @@ fpc_info:
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  Mv........ $(MVPROG)
+	@$(ECHO)  Cp........ $(CPPROG)
+	@$(ECHO)  Rm........ $(RMPROG)
+	@$(ECHO)  GInstall.. $(GINSTALL)
 	@$(ECHO)  Echo...... $(ECHO)
-	@$(ECHO)  PPUMove... $(PPUMOVE)
-	@$(ECHO)  PPUFiles.. $(PPUFILES)
 	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
+	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -803,9 +897,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples:
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -818,7 +912,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 14 - 2
tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: allexectests
 override PATH:=$(subst \,/,$(PATH))
@@ -363,6 +363,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -416,6 +422,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -423,6 +432,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -591,7 +603,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR

+ 18 - 3
tests/units/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -364,6 +364,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -417,6 +423,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -424,6 +433,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -543,6 +555,9 @@ endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -644,7 +659,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -724,7 +739,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG

+ 21 - 3
utils/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -368,6 +368,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -421,6 +427,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -428,6 +437,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -576,6 +588,11 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
@@ -816,7 +833,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -906,7 +923,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG
@@ -1005,6 +1022,7 @@ ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
 	$(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1
+	$(MKDIR) $(DIST_DESTDIR)
 	$(DEL) $(ZIPDESTFILE)
 ifdef USEZIPWRAPPER
 ifneq ($(ECHOREDIR),echo)

+ 18 - 3
utils/dxegen/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -367,6 +367,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -420,6 +426,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -427,6 +436,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -546,6 +558,9 @@ endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -647,7 +662,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -731,7 +746,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG

+ 20 - 3
utils/fpcm/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -366,6 +366,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -419,6 +425,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -426,6 +435,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -574,6 +586,11 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
@@ -814,7 +831,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -904,7 +921,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG

+ 18 - 3
utils/fprcp/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -365,6 +365,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -418,6 +424,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -425,6 +434,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -544,6 +556,9 @@ endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -645,7 +660,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -729,7 +744,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG

+ 18 - 3
utils/h2pas/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -366,6 +366,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -419,6 +425,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -426,6 +435,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -545,6 +557,9 @@ endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -646,7 +661,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -730,7 +745,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG

+ 18 - 3
utils/simulator/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -365,6 +365,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -418,6 +424,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -425,6 +434,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -544,6 +556,9 @@ endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -645,7 +660,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -729,7 +744,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG

+ 18 - 3
utils/tply/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -367,6 +367,12 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.freebsd
 ZIPSUFFIX=freebsd
 endif
+ifeq ($(OS_TARGET),netbsd)
+EXEEXT=
+HASSHAREDLIB=1
+FPCMADE=fpcmade.netbsd
+ZIPSUFFIX=netbsd
+endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -420,6 +426,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+UNIXINSTALLDIR=1
+endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -427,6 +436,9 @@ endif
 ifeq ($(OS_SOURCE),freebsd)
 UNIXINSTALLDIR=1
 endif
+ifeq ($(OS_SOURCE),netbsd)
+UNIXINSTALLDIR=1
+endif
 endif
 ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
@@ -546,6 +558,9 @@ endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -647,7 +662,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@@ -739,7 +754,7 @@ endif
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
 endif
-fpc_install: $(INSTALLTARGET)
+fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
 ifdef UPXPROG