Browse Source

* regenerated

peter 26 years ago
parent
commit
926aa3030b
61 changed files with 738 additions and 638 deletions
  1. 4 1
      base/Makefile
  2. 3 0
      base/Makefile.fpc
  3. 12 12
      compiler/Makefile
  4. 12 12
      compiler/new/Makefile
  5. 16 16
      fcl/Makefile
  6. 17 13
      fcl/db/Makefile
  7. 17 14
      fcl/go32v2/Makefile
  8. 0 1
      fcl/go32v2/Makefile.fpc
  9. 17 14
      fcl/linux/Makefile
  10. 0 1
      fcl/linux/Makefile.fpc
  11. 12 13
      fcl/os2/Makefile
  12. 0 1
      fcl/os2/Makefile.fpc
  13. 22 13
      fcl/shedit/Makefile
  14. 12 12
      fcl/template/Makefile
  15. 12 12
      fcl/tests/Makefile
  16. 17 14
      fcl/win32/Makefile
  17. 0 1
      fcl/win32/Makefile.fpc
  18. 1 1
      ide/Makefile
  19. 1 1
      ide/fake/Makefile
  20. 12 12
      ide/fake/compiler/Makefile
  21. 12 12
      ide/fake/gdb/Makefile
  22. 27 13
      ide/text/Makefile
  23. 12 12
      install/Makefile
  24. 11 3
      install/debian/README.debian
  25. 33 1
      install/debian/changelog
  26. 31 39
      install/debian/control.in
  27. 4 17
      install/debian/copyright
  28. 1 2
      install/debian/fixdeb
  29. 0 2
      install/debian/fp-compiler.files.in
  30. 4 4
      install/debian/fp-docs.docs.in
  31. 37 42
      install/debian/rules
  32. 12 12
      install/demo/Makefile
  33. 12 12
      install/fpinst/Makefile
  34. 54 2
      packages/Makefile
  35. 2 2
      packages/Makefile.fpc
  36. 12 12
      packages/gdbint/Makefile
  37. 1 1
      packages/gdbint/libgdb/Makefile
  38. 12 12
      packages/ggi/Makefile
  39. 12 12
      packages/gtk/Makefile
  40. 12 12
      packages/gtk/examples/Makefile
  41. 12 12
      packages/gtk/tutorial/Makefile
  42. 12 12
      packages/ibase/Makefile
  43. 12 12
      packages/inet/Makefile
  44. 12 12
      packages/mysql/Makefile
  45. 12 12
      packages/ncurses/Makefile
  46. 12 12
      packages/paszlib/Makefile
  47. 12 12
      packages/postgres/Makefile
  48. 12 12
      packages/svgalib/Makefile
  49. 12 12
      packages/uncgi/Makefile
  50. 12 12
      packages/utmp/Makefile
  51. 16 16
      rtl/Makefile
  52. 13 13
      rtl/go32v1/Makefile
  53. 13 13
      rtl/go32v2/Makefile
  54. 13 13
      rtl/linux/Makefile
  55. 13 13
      rtl/os2/Makefile
  56. 13 13
      rtl/win32/Makefile
  57. 1 1
      tests/Makefile
  58. 12 12
      utils/Makefile
  59. 12 12
      utils/h2pas/Makefile
  60. 12 12
      utils/simulator/Makefile
  61. 12 12
      utils/tply/Makefile

+ 4 - 1
base/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: info
@@ -150,6 +150,9 @@ ZIPTARGET=install
 
 # Directories
 
+ifndef FPCDIR
+FPCDIR=.
+endif
 ifndef PACKAGEDIR
 PACKAGEDIR=$(FPCDIR)/packages
 endif

+ 3 - 0
base/Makefile.fpc

@@ -8,6 +8,9 @@ dirs=compiler rtl utils packages fcl ide
 [defaults]
 defaultrule=info
 
+[dirs]
+fpcdir=.
+
 [sections]
 none=1
 dirs=1

+ 12 - 12
compiler/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all
@@ -808,12 +808,12 @@ fpc_smart:
 fpc_shared: all
 ifdef inlinux
 ifndef LIBNAME
-	@$(ECHO) LIBNAME not set
+	@$(ECHO) "LIBNAME not set"
 else
 	$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)
 endif
 else
-	@$(ECHO) Shared Libraries not supported
+	@$(ECHO) "Shared Libraries not supported"
 endif
 
 #####################################################################
@@ -841,19 +841,19 @@ endif
 
 fpc_showinstall: $(SHOWINSTALLTARGET)
 ifdef INSTALLEXEFILES
-	@$(ECHO) $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
+	@$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
 endif
 ifdef INSTALLPPUFILES
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
 ifneq ($(INSTALLPPULINKFILES),)
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
 endif
 ifneq ($(INSTALLPPULIBFILES),)
-	@$(ECHO) $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
+	@$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
 endif
 endif
 ifdef EXTRAINSTALLFILES
-	@$(ECHO) $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
+	@$(ECHO) -e $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
 endif
 
 fpc_install: $(INSTALLTARGET)
@@ -922,8 +922,8 @@ endif
 # Note: This will not remove the zipfile first
 fpc_zipinstalladd:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
 ifdef inlinux
@@ -939,8 +939,8 @@ endif
 # First remove the zip and then install
 fpc_zipinstall:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)

+ 12 - 12
compiler/new/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all
@@ -834,12 +834,12 @@ fpc_smart:
 fpc_shared: all
 ifdef inlinux
 ifndef LIBNAME
-	@$(ECHO) LIBNAME not set
+	@$(ECHO) "LIBNAME not set"
 else
 	$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)
 endif
 else
-	@$(ECHO) Shared Libraries not supported
+	@$(ECHO) "Shared Libraries not supported"
 endif
 
 #####################################################################
@@ -867,19 +867,19 @@ endif
 
 fpc_showinstall: $(SHOWINSTALLTARGET)
 ifdef INSTALLEXEFILES
-	@$(ECHO) $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
+	@$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
 endif
 ifdef INSTALLPPUFILES
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
 ifneq ($(INSTALLPPULINKFILES),)
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
 endif
 ifneq ($(INSTALLPPULIBFILES),)
-	@$(ECHO) $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
+	@$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
 endif
 endif
 ifdef EXTRAINSTALLFILES
-	@$(ECHO) $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
+	@$(ECHO) -e $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
 endif
 
 fpc_install: $(INSTALLTARGET)
@@ -948,8 +948,8 @@ endif
 # Note: This will not remove the zipfile first
 fpc_zipinstalladd:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
 ifdef inlinux
@@ -965,8 +965,8 @@ endif
 # First remove the zip and then install
 fpc_zipinstall:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)

+ 16 - 16
fcl/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all
@@ -167,35 +167,35 @@ endif
 # Standard rules
 #####################################################################
 
-all: $(OS_TARGET)_all
+all: $(addsuffix _all,$(OS_TARGET))
 
-debug: $(OS_TARGET)_debug
+debug: $(addsuffix _debug,$(OS_TARGET))
 
-examples: $(OS_TARGET)_examples
+examples: $(addsuffix _examples,$(OS_TARGET))
 
-test: $(OS_TARGET)_test
+test: $(addsuffix _test,$(OS_TARGET))
 
-smart: $(OS_TARGET)_smart
+smart: $(addsuffix _smart,$(OS_TARGET))
 
-shared: $(OS_TARGET)_shared
+shared: $(addsuffix _shared,$(OS_TARGET))
 
-showinstall: $(OS_TARGET)_showinstall
+showinstall: $(addsuffix _showinstall,$(OS_TARGET))
 
-install: $(OS_TARGET)_install
+install: $(addsuffix _install,$(OS_TARGET))
 
-sourceinstall: $(OS_TARGET)_sourceinstall
+sourceinstall: $(addsuffix _sourceinstall,$(OS_TARGET))
 
-zipinstall: $(OS_TARGET)_zipinstall
+zipinstall: $(addsuffix _zipinstall,$(OS_TARGET))
 
-zipinstalladd: $(OS_TARGET)_zipinstalladd
+zipinstalladd: $(addsuffix _zipinstalladd,$(OS_TARGET))
 
-clean: $(OS_TARGET)_clean
+clean: $(addsuffix _clean,$(OS_TARGET))
 
-cleanall: $(OS_TARGET)_cleanall
+cleanall: $(addsuffix _cleanall,$(OS_TARGET))
 
-depend: $(OS_TARGET)_depend
+depend: $(addsuffix _depend,$(OS_TARGET))
 
-info: $(OS_TARGET)_info
+info: $(addsuffix _info,$(OS_TARGET))
 
 .PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipinstalladd clean cleanall depend info
 

+ 17 - 13
fcl/db/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all
@@ -175,7 +175,11 @@ endif
 
 override PACKAGES+=mysql
 override NEEDUNITDIR+=$(FPCDIR)/fcl/$(OS_TARGET)
-override NEEDUNITDIR+=$(addprefix $(PACKAGEDIR)/,$(PACKAGES))
+ifneq ($(wildcard $(PACKAGEDIR)/mysql/$(OS_TARGET)),)
+override NEEDUNITDIR+=$(PACKAGEDIR)/mysql/$(OS_TARGET)
+else
+override NEEDUNITDIR+=$(PACKAGEDIR)/mysql
+endif
 
 # Libraries
 
@@ -803,12 +807,12 @@ fpc_smart:
 fpc_shared: all
 ifdef inlinux
 ifndef LIBNAME
-	@$(ECHO) LIBNAME not set
+	@$(ECHO) "LIBNAME not set"
 else
 	$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)
 endif
 else
-	@$(ECHO) Shared Libraries not supported
+	@$(ECHO) "Shared Libraries not supported"
 endif
 
 #####################################################################
@@ -836,19 +840,19 @@ endif
 
 fpc_showinstall: $(SHOWINSTALLTARGET)
 ifdef INSTALLEXEFILES
-	@$(ECHO) $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
+	@$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
 endif
 ifdef INSTALLPPUFILES
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
 ifneq ($(INSTALLPPULINKFILES),)
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
 endif
 ifneq ($(INSTALLPPULIBFILES),)
-	@$(ECHO) $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
+	@$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
 endif
 endif
 ifdef EXTRAINSTALLFILES
-	@$(ECHO) $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
+	@$(ECHO) -e $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
 endif
 
 fpc_install: $(INSTALLTARGET)
@@ -917,8 +921,8 @@ endif
 # Note: This will not remove the zipfile first
 fpc_zipinstalladd:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
 ifdef inlinux
@@ -934,8 +938,8 @@ endif
 # First remove the zip and then install
 fpc_zipinstall:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)

+ 17 - 14
fcl/go32v2/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all
@@ -64,7 +64,6 @@ endif
 #####################################################################
 
 override OS_TARGET:=go32v2
-override CPU_TARGET:=i386
 
 #####################################################################
 # FPC version/target Detection
@@ -187,7 +186,11 @@ endif
 # Packages
 
 override PACKAGES+=paszlib
-override NEEDUNITDIR+=$(addprefix $(PACKAGEDIR)/,$(PACKAGES))
+ifneq ($(wildcard $(PACKAGEDIR)/paszlib/$(OS_TARGET)),)
+override NEEDUNITDIR+=$(PACKAGEDIR)/paszlib/$(OS_TARGET)
+else
+override NEEDUNITDIR+=$(PACKAGEDIR)/paszlib
+endif
 
 # Libraries
 
@@ -781,12 +784,12 @@ fpc_smart:
 fpc_shared: all
 ifdef inlinux
 ifndef LIBNAME
-	@$(ECHO) LIBNAME not set
+	@$(ECHO) "LIBNAME not set"
 else
 	$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)
 endif
 else
-	@$(ECHO) Shared Libraries not supported
+	@$(ECHO) "Shared Libraries not supported"
 endif
 
 #####################################################################
@@ -814,19 +817,19 @@ endif
 
 fpc_showinstall: $(SHOWINSTALLTARGET)
 ifdef INSTALLEXEFILES
-	@$(ECHO) $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
+	@$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
 endif
 ifdef INSTALLPPUFILES
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
 ifneq ($(INSTALLPPULINKFILES),)
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
 endif
 ifneq ($(INSTALLPPULIBFILES),)
-	@$(ECHO) $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
+	@$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
 endif
 endif
 ifdef EXTRAINSTALLFILES
-	@$(ECHO) $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
+	@$(ECHO) -e $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
 endif
 
 fpc_install: $(INSTALLTARGET)
@@ -895,8 +898,8 @@ endif
 # Note: This will not remove the zipfile first
 fpc_zipinstalladd:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
 ifdef inlinux
@@ -912,8 +915,8 @@ endif
 # First remove the zip and then install
 fpc_zipinstall:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)

+ 0 - 1
fcl/go32v2/Makefile.fpc

@@ -4,7 +4,6 @@
 
 [defaults]
 defaulttarget=go32v2
-defaultcpu=i386
 defaultoptions=-S2
 
 [packages]

+ 17 - 14
fcl/linux/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all
@@ -64,7 +64,6 @@ endif
 #####################################################################
 
 override OS_TARGET:=linux
-override CPU_TARGET:=i386
 
 #####################################################################
 # FPC version/target Detection
@@ -187,7 +186,11 @@ endif
 # Packages
 
 override PACKAGES+=zlib
-override NEEDUNITDIR+=$(addprefix $(PACKAGEDIR)/,$(PACKAGES))
+ifneq ($(wildcard $(PACKAGEDIR)/zlib/$(OS_TARGET)),)
+override NEEDUNITDIR+=$(PACKAGEDIR)/zlib/$(OS_TARGET)
+else
+override NEEDUNITDIR+=$(PACKAGEDIR)/zlib
+endif
 
 # Libraries
 
@@ -781,12 +784,12 @@ fpc_smart:
 fpc_shared: all
 ifdef inlinux
 ifndef LIBNAME
-	@$(ECHO) LIBNAME not set
+	@$(ECHO) "LIBNAME not set"
 else
 	$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)
 endif
 else
-	@$(ECHO) Shared Libraries not supported
+	@$(ECHO) "Shared Libraries not supported"
 endif
 
 #####################################################################
@@ -814,19 +817,19 @@ endif
 
 fpc_showinstall: $(SHOWINSTALLTARGET)
 ifdef INSTALLEXEFILES
-	@$(ECHO) $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
+	@$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
 endif
 ifdef INSTALLPPUFILES
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
 ifneq ($(INSTALLPPULINKFILES),)
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
 endif
 ifneq ($(INSTALLPPULIBFILES),)
-	@$(ECHO) $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
+	@$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
 endif
 endif
 ifdef EXTRAINSTALLFILES
-	@$(ECHO) $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
+	@$(ECHO) -e $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
 endif
 
 fpc_install: $(INSTALLTARGET)
@@ -895,8 +898,8 @@ endif
 # Note: This will not remove the zipfile first
 fpc_zipinstalladd:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
 ifdef inlinux
@@ -912,8 +915,8 @@ endif
 # First remove the zip and then install
 fpc_zipinstall:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)

+ 0 - 1
fcl/linux/Makefile.fpc

@@ -4,7 +4,6 @@
 
 [defaults]
 defaulttarget=linux
-defaultcpu=i386
 defaultoptions=-S2
 
 [packages]

+ 12 - 13
fcl/os2/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all
@@ -64,7 +64,6 @@ endif
 #####################################################################
 
 override OS_TARGET:=os2
-override CPU_TARGET:=i386
 
 #####################################################################
 # FPC version/target Detection
@@ -764,12 +763,12 @@ fpc_smart:
 fpc_shared: all
 ifdef inlinux
 ifndef LIBNAME
-	@$(ECHO) LIBNAME not set
+	@$(ECHO) "LIBNAME not set"
 else
 	$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)
 endif
 else
-	@$(ECHO) Shared Libraries not supported
+	@$(ECHO) "Shared Libraries not supported"
 endif
 
 #####################################################################
@@ -797,19 +796,19 @@ endif
 
 fpc_showinstall: $(SHOWINSTALLTARGET)
 ifdef INSTALLEXEFILES
-	@$(ECHO) $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
+	@$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
 endif
 ifdef INSTALLPPUFILES
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
 ifneq ($(INSTALLPPULINKFILES),)
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
 endif
 ifneq ($(INSTALLPPULIBFILES),)
-	@$(ECHO) $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
+	@$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
 endif
 endif
 ifdef EXTRAINSTALLFILES
-	@$(ECHO) $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
+	@$(ECHO) -e $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
 endif
 
 fpc_install: $(INSTALLTARGET)
@@ -878,8 +877,8 @@ endif
 # Note: This will not remove the zipfile first
 fpc_zipinstalladd:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
 ifdef inlinux
@@ -895,8 +894,8 @@ endif
 # First remove the zip and then install
 fpc_zipinstall:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)

+ 0 - 1
fcl/os2/Makefile.fpc

@@ -4,7 +4,6 @@
 
 [defaults]
 defaulttarget=os2
-defaultcpu=i386
 defaultoptions=-S2
 
 [dirs]

+ 22 - 13
fcl/shedit/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all
@@ -181,7 +181,16 @@ ifeq ($(OS_TARGET),win32)
 override PACKAGES+=gtk
 endif
 override NEEDUNITDIR+=$(FPCDIR)/fcl/$(OS_TARGET)
-override NEEDUNITDIR+=$(addprefix $(PACKAGEDIR)/,$(PACKAGES))
+ifneq ($(wildcard $(PACKAGEDIR)/gtk/$(OS_TARGET)),)
+override NEEDUNITDIR+=$(PACKAGEDIR)/gtk/$(OS_TARGET)
+else
+override NEEDUNITDIR+=$(PACKAGEDIR)/gtk
+endif
+ifneq ($(wildcard $(PACKAGEDIR)/gtk/$(OS_TARGET)),)
+override NEEDUNITDIR+=$(PACKAGEDIR)/gtk/$(OS_TARGET)
+else
+override NEEDUNITDIR+=$(PACKAGEDIR)/gtk
+endif
 
 # Libraries
 
@@ -793,12 +802,12 @@ fpc_smart:
 fpc_shared: all
 ifdef inlinux
 ifndef LIBNAME
-	@$(ECHO) LIBNAME not set
+	@$(ECHO) "LIBNAME not set"
 else
 	$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)
 endif
 else
-	@$(ECHO) Shared Libraries not supported
+	@$(ECHO) "Shared Libraries not supported"
 endif
 
 #####################################################################
@@ -826,19 +835,19 @@ endif
 
 fpc_showinstall: $(SHOWINSTALLTARGET)
 ifdef INSTALLEXEFILES
-	@$(ECHO) $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
+	@$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
 endif
 ifdef INSTALLPPUFILES
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
 ifneq ($(INSTALLPPULINKFILES),)
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
 endif
 ifneq ($(INSTALLPPULIBFILES),)
-	@$(ECHO) $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
+	@$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
 endif
 endif
 ifdef EXTRAINSTALLFILES
-	@$(ECHO) $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
+	@$(ECHO) -e $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
 endif
 
 fpc_install: $(INSTALLTARGET)
@@ -907,8 +916,8 @@ endif
 # Note: This will not remove the zipfile first
 fpc_zipinstalladd:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
 ifdef inlinux
@@ -924,8 +933,8 @@ endif
 # First remove the zip and then install
 fpc_zipinstall:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)

+ 12 - 12
fcl/template/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all
@@ -763,12 +763,12 @@ fpc_smart:
 fpc_shared: all
 ifdef inlinux
 ifndef LIBNAME
-	@$(ECHO) LIBNAME not set
+	@$(ECHO) "LIBNAME not set"
 else
 	$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)
 endif
 else
-	@$(ECHO) Shared Libraries not supported
+	@$(ECHO) "Shared Libraries not supported"
 endif
 
 #####################################################################
@@ -796,19 +796,19 @@ endif
 
 fpc_showinstall: $(SHOWINSTALLTARGET)
 ifdef INSTALLEXEFILES
-	@$(ECHO) $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
+	@$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
 endif
 ifdef INSTALLPPUFILES
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
 ifneq ($(INSTALLPPULINKFILES),)
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
 endif
 ifneq ($(INSTALLPPULIBFILES),)
-	@$(ECHO) $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
+	@$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
 endif
 endif
 ifdef EXTRAINSTALLFILES
-	@$(ECHO) $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
+	@$(ECHO) -e $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
 endif
 
 fpc_install: $(INSTALLTARGET)
@@ -877,8 +877,8 @@ endif
 # Note: This will not remove the zipfile first
 fpc_zipinstalladd:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
 ifdef inlinux
@@ -894,8 +894,8 @@ endif
 # First remove the zip and then install
 fpc_zipinstall:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)

+ 12 - 12
fcl/tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all
@@ -756,12 +756,12 @@ fpc_smart:
 fpc_shared: all
 ifdef inlinux
 ifndef LIBNAME
-	@$(ECHO) LIBNAME not set
+	@$(ECHO) "LIBNAME not set"
 else
 	$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)
 endif
 else
-	@$(ECHO) Shared Libraries not supported
+	@$(ECHO) "Shared Libraries not supported"
 endif
 
 #####################################################################
@@ -789,19 +789,19 @@ endif
 
 fpc_showinstall: $(SHOWINSTALLTARGET)
 ifdef INSTALLEXEFILES
-	@$(ECHO) $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
+	@$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
 endif
 ifdef INSTALLPPUFILES
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
 ifneq ($(INSTALLPPULINKFILES),)
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
 endif
 ifneq ($(INSTALLPPULIBFILES),)
-	@$(ECHO) $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
+	@$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
 endif
 endif
 ifdef EXTRAINSTALLFILES
-	@$(ECHO) $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
+	@$(ECHO) -e $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
 endif
 
 fpc_install: $(INSTALLTARGET)
@@ -870,8 +870,8 @@ endif
 # Note: This will not remove the zipfile first
 fpc_zipinstalladd:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
 ifdef inlinux
@@ -887,8 +887,8 @@ endif
 # First remove the zip and then install
 fpc_zipinstall:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)

+ 17 - 14
fcl/win32/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all
@@ -64,7 +64,6 @@ endif
 #####################################################################
 
 override OS_TARGET:=win32
-override CPU_TARGET:=i386
 
 #####################################################################
 # FPC version/target Detection
@@ -187,7 +186,11 @@ endif
 # Packages
 
 override PACKAGES+=paszlib
-override NEEDUNITDIR+=$(addprefix $(PACKAGEDIR)/,$(PACKAGES))
+ifneq ($(wildcard $(PACKAGEDIR)/paszlib/$(OS_TARGET)),)
+override NEEDUNITDIR+=$(PACKAGEDIR)/paszlib/$(OS_TARGET)
+else
+override NEEDUNITDIR+=$(PACKAGEDIR)/paszlib
+endif
 
 # Libraries
 
@@ -781,12 +784,12 @@ fpc_smart:
 fpc_shared: all
 ifdef inlinux
 ifndef LIBNAME
-	@$(ECHO) LIBNAME not set
+	@$(ECHO) "LIBNAME not set"
 else
 	$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)
 endif
 else
-	@$(ECHO) Shared Libraries not supported
+	@$(ECHO) "Shared Libraries not supported"
 endif
 
 #####################################################################
@@ -814,19 +817,19 @@ endif
 
 fpc_showinstall: $(SHOWINSTALLTARGET)
 ifdef INSTALLEXEFILES
-	@$(ECHO) $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
+	@$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
 endif
 ifdef INSTALLPPUFILES
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
 ifneq ($(INSTALLPPULINKFILES),)
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
 endif
 ifneq ($(INSTALLPPULIBFILES),)
-	@$(ECHO) $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
+	@$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
 endif
 endif
 ifdef EXTRAINSTALLFILES
-	@$(ECHO) $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
+	@$(ECHO) -e $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
 endif
 
 fpc_install: $(INSTALLTARGET)
@@ -895,8 +898,8 @@ endif
 # Note: This will not remove the zipfile first
 fpc_zipinstalladd:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
 ifdef inlinux
@@ -912,8 +915,8 @@ endif
 # First remove the zip and then install
 fpc_zipinstall:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)

+ 0 - 1
fcl/win32/Makefile.fpc

@@ -4,7 +4,6 @@
 
 [defaults]
 defaulttarget=win32
-defaultcpu=i386
 defaultoptions=-S2
 
 [packages]

+ 1 - 1
ide/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all

+ 1 - 1
ide/fake/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all

+ 12 - 12
ide/fake/compiler/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all
@@ -715,12 +715,12 @@ fpc_smart:
 fpc_shared: all
 ifdef inlinux
 ifndef LIBNAME
-	@$(ECHO) LIBNAME not set
+	@$(ECHO) "LIBNAME not set"
 else
 	$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)
 endif
 else
-	@$(ECHO) Shared Libraries not supported
+	@$(ECHO) "Shared Libraries not supported"
 endif
 
 #####################################################################
@@ -748,19 +748,19 @@ endif
 
 fpc_showinstall: $(SHOWINSTALLTARGET)
 ifdef INSTALLEXEFILES
-	@$(ECHO) $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
+	@$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
 endif
 ifdef INSTALLPPUFILES
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
 ifneq ($(INSTALLPPULINKFILES),)
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
 endif
 ifneq ($(INSTALLPPULIBFILES),)
-	@$(ECHO) $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
+	@$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
 endif
 endif
 ifdef EXTRAINSTALLFILES
-	@$(ECHO) $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
+	@$(ECHO) -e $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
 endif
 
 fpc_install: $(INSTALLTARGET)
@@ -829,8 +829,8 @@ endif
 # Note: This will not remove the zipfile first
 fpc_zipinstalladd:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
 ifdef inlinux
@@ -846,8 +846,8 @@ endif
 # First remove the zip and then install
 fpc_zipinstall:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)

+ 12 - 12
ide/fake/gdb/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all
@@ -715,12 +715,12 @@ fpc_smart:
 fpc_shared: all
 ifdef inlinux
 ifndef LIBNAME
-	@$(ECHO) LIBNAME not set
+	@$(ECHO) "LIBNAME not set"
 else
 	$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)
 endif
 else
-	@$(ECHO) Shared Libraries not supported
+	@$(ECHO) "Shared Libraries not supported"
 endif
 
 #####################################################################
@@ -748,19 +748,19 @@ endif
 
 fpc_showinstall: $(SHOWINSTALLTARGET)
 ifdef INSTALLEXEFILES
-	@$(ECHO) $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
+	@$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
 endif
 ifdef INSTALLPPUFILES
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
 ifneq ($(INSTALLPPULINKFILES),)
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
 endif
 ifneq ($(INSTALLPPULIBFILES),)
-	@$(ECHO) $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
+	@$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
 endif
 endif
 ifdef EXTRAINSTALLFILES
-	@$(ECHO) $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
+	@$(ECHO) -e $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
 endif
 
 fpc_install: $(INSTALLTARGET)
@@ -829,8 +829,8 @@ endif
 # Note: This will not remove the zipfile first
 fpc_zipinstalladd:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
 ifdef inlinux
@@ -846,8 +846,8 @@ endif
 # First remove the zip and then install
 fpc_zipinstall:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)

+ 27 - 13
ide/text/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all
@@ -194,7 +194,21 @@ override NEEDOBJDIR=$(GDBOBJDIR)
 # Packages
 
 override PACKAGES+=api fv gdbint
-override NEEDUNITDIR+=$(addprefix $(PACKAGEDIR)/,$(PACKAGES))
+ifneq ($(wildcard $(PACKAGEDIR)/api/$(OS_TARGET)),)
+override NEEDUNITDIR+=$(PACKAGEDIR)/api/$(OS_TARGET)
+else
+override NEEDUNITDIR+=$(PACKAGEDIR)/api
+endif
+ifneq ($(wildcard $(PACKAGEDIR)/fv/$(OS_TARGET)),)
+override NEEDUNITDIR+=$(PACKAGEDIR)/fv/$(OS_TARGET)
+else
+override NEEDUNITDIR+=$(PACKAGEDIR)/fv
+endif
+ifneq ($(wildcard $(PACKAGEDIR)/gdbint/$(OS_TARGET)),)
+override NEEDUNITDIR+=$(PACKAGEDIR)/gdbint/$(OS_TARGET)
+else
+override NEEDUNITDIR+=$(PACKAGEDIR)/gdbint
+endif
 
 # Libraries
 
@@ -822,12 +836,12 @@ fpc_smart:
 fpc_shared: all
 ifdef inlinux
 ifndef LIBNAME
-	@$(ECHO) LIBNAME not set
+	@$(ECHO) "LIBNAME not set"
 else
 	$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)
 endif
 else
-	@$(ECHO) Shared Libraries not supported
+	@$(ECHO) "Shared Libraries not supported"
 endif
 
 #####################################################################
@@ -855,19 +869,19 @@ endif
 
 fpc_showinstall: $(SHOWINSTALLTARGET)
 ifdef INSTALLEXEFILES
-	@$(ECHO) $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
+	@$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
 endif
 ifdef INSTALLPPUFILES
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
 ifneq ($(INSTALLPPULINKFILES),)
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
 endif
 ifneq ($(INSTALLPPULIBFILES),)
-	@$(ECHO) $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
+	@$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
 endif
 endif
 ifdef EXTRAINSTALLFILES
-	@$(ECHO) $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
+	@$(ECHO) -e $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
 endif
 
 fpc_install: $(INSTALLTARGET)
@@ -936,8 +950,8 @@ endif
 # Note: This will not remove the zipfile first
 fpc_zipinstalladd:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
 ifdef inlinux
@@ -953,8 +967,8 @@ endif
 # First remove the zip and then install
 fpc_zipinstall:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)

+ 12 - 12
install/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: help
@@ -727,12 +727,12 @@ fpc_smart:
 fpc_shared: all
 ifdef inlinux
 ifndef LIBNAME
-	@$(ECHO) LIBNAME not set
+	@$(ECHO) "LIBNAME not set"
 else
 	$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)
 endif
 else
-	@$(ECHO) Shared Libraries not supported
+	@$(ECHO) "Shared Libraries not supported"
 endif
 
 #####################################################################
@@ -760,19 +760,19 @@ endif
 
 fpc_showinstall: $(SHOWINSTALLTARGET)
 ifdef INSTALLEXEFILES
-	@$(ECHO) $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
+	@$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
 endif
 ifdef INSTALLPPUFILES
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
 ifneq ($(INSTALLPPULINKFILES),)
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
 endif
 ifneq ($(INSTALLPPULIBFILES),)
-	@$(ECHO) $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
+	@$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
 endif
 endif
 ifdef EXTRAINSTALLFILES
-	@$(ECHO) $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
+	@$(ECHO) -e $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
 endif
 
 fpc_install: $(INSTALLTARGET)
@@ -841,8 +841,8 @@ endif
 # Note: This will not remove the zipfile first
 fpc_zipinstalladd:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
 ifdef inlinux
@@ -858,8 +858,8 @@ endif
 # First remove the zip and then install
 fpc_zipinstall:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)

+ 11 - 3
install/debian/README.debian

@@ -1,8 +1,18 @@
 Free Pascal for DEBIAN
 ----------------------
 
+Note: Free Vision (fp-fv) had to be removed due to licesing issues.
+      It will return into the distribution as soon as these issues are resolved.
+
+Note: To create a new config file for fpc (/etc/ppc386.cfg) use the command:
+      /usr/lib/fpc/0.99.13/samplecfg /usr/lib/fpc/0.99.13
+
+Web site and download information:
+----------------------------------
+
 The Original site is
-  http://tfdec1.fys.kuleuven.ac.be/~michael/fpc/
+  http://www.freepascal.org/
+  ftp://ftp.freepascal.org/
   
 HTTP Mirrored at  
   http://www.brain.uni-freiburg.de/~klaus/fpc/
@@ -19,5 +29,3 @@ FTP Mirrored at
   ftp://ftp.fisek.com.tr/pub/fpc/
   http://clubinfo.collegebdeb.qc.ca/nuitari/fpc/
 
-
-Peter Vreman <[email protected]>, Tue, 20 Mar 1999 12:00:00 +0200

+ 33 - 1
install/debian/changelog

@@ -1,3 +1,35 @@
+fpc (0.99.13-19991013-4) unstable; urgency=low
+
+  * Fixed bashism in samplecfg (Closes: Bug#50636)
+  * Changed source-arch to 'i386' (Closes: Bug#50438)
+
+ -- Mika Fischer <[email protected]>  Sat, 20 Nov 1999 22:18:11 +0100
+
+fpc (0.99.13-19991013-3) unstable; urgency=low
+
+  * Fixed bug which overwrote existing config files during an update
+    (Closes: Bug#50278)
+
+ -- Mika Fischer <[email protected]>  Tue, 16 Nov 1999 23:57:36 +0100
+
+fpc (0.99.13-19991013-2) unstable; urgency=low
+
+  * Fixed bug in debian/rules (Fixes: #50096)
+
+ -- Mika Fischer <[email protected]>  Sat, 13 Nov 1999 20:31:20 +0100
+
+fpc (0.99.13-19991013-1) unstable; urgency=low
+
+  * Removed fp-fv due to licensing issues.
+
+ -- Mika Fischer <[email protected]>  Wed, 13 Oct 1999 19:33:30 +0200
+
+fpc (0.99.13-19991005-1) unstable; urgency=low
+
+  * New maintainer
+
+ -- Mika Fischer <[email protected]>  Wed, 13 Oct 1999 19:33:13 +0200
+
 fpc (0.99.13-19991001-1) unstable; urgency=low
 
   * New maintainer
@@ -19,5 +51,5 @@ fpc (0.99.12a-1) unstable; urgency=low
 
 Local variables:
 mode: debian-changelog
-add-log-mailing-address: "[email protected]"
+add-log-mailing-address: "[email protected]"
 End:

+ 31 - 39
install/debian/control.in

@@ -1,14 +1,14 @@
 Source: fpc
 Section: devel
 Priority: optional
-Maintainer: Joseph Carter <[email protected]>
-Standards-Version: 3.0.1
+Architecture: i386
+Maintainer: Mika Fischer <[email protected]>
+Standards-Version: 3.1.1
 
 Package: fp-compiler
 Architecture: i386
 Depends: fp-rtl (= #PACKAGEVERSION#)
-Recommends: fp-docs (= #PACKAGEVERSION#)
-Suggests: fp-utils
+Suggests: fp-utils, fp-docs (>= #FPCVERSION#)
 Replaces: fpc
 Description: Free Pascal Compiler
  The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32bit
@@ -26,6 +26,12 @@ Replaces: fpc
 Description: Free Pascal Runtime Library
  Runtime Libraries for the Free Pascal Compiler.
 
+Package: fp-fcl
+Architecture: i386
+Depends: fp-compiler (= #PACKAGEVERSION#), fp-rtl (= #PACKAGEVERSION#)
+Description: Free Pascal Free Component Library
+ Free Component Library for the Free Pascal Compiler.
+
 Package: fp-utils
 Architecture: i386
 Recommends: fp-compiler (= #PACKAGEVERSION#)
@@ -33,55 +39,41 @@ Replaces: fpc
 Description: Free Pascal Utils
  This package contains some handy utils for usage with the Free Pascal
  Compiler:
-   - h2pas : Convert .h files to pascal units
-   - ppdep : Create a dependency file which can be used with Makefiles
-   - ptop  : Source beautifier
-   - ppudump : Dump the information stored in a .ppu (unit) file
-   - ppumove : Place multiple units in a shared library
+   - ppumove   Place multiple units in a shared library
+   - ppufiles  Show needed files for units
+   - ppudump   Dump the information stored in a .ppu (unit) file
+   - fpcmake   Create Makefile from Makefile.fpc
+   - h2pas     Convert .h files to pascal units
+   - ppdep     Create a dependency file which can be used with Makefiles
+   - ptop      Source beautifier
 
 Package: fp-docs
 Architecture: all
 Replaces: fpc
 Description: Free Pascal Documentation
- Documentation for the Free Pascal Compiler.
-
-Package: fp-fcl
-Architecture: i386
-Depends: fp-compiler (= #PACKAGEVERSION#), fp-rtl (= #PACKAGEVERSION#)
-Description: Free Pascal Free Component Library
- Free Component Library for the Free Pascal Compiler.
+ Documentation for the Free Pascal Compiler. The documentation is
+ only available in PDF format.
 
-Package: fp-gtk
-Architecture: i386
-Depends: fp-compiler (= #PACKAGEVERSION#), fp-rtl (= #PACKAGEVERSION#)
-Description: Free Pascal GTK Bindings
- GTK 1.2.x bindings for the Free Pascal Compiler.
-
-Package: fp-api
-Architecture: i386
-Depends: fp-compiler (= #PACKAGEVERSION#), fp-rtl (= #PACKAGEVERSION#)
-Description: Free Pascal API Units
- API Units needed by Free Vision.
-
-Package: fp-fv
-Architecture: i386
-Depends: fp-compiler (= #PACKAGEVERSION#), fp-rtl (= #PACKAGEVERSION#), fp-api (= #PACKAGEVERSION#)
-Description: Free Pascal Free Vision
- Free Turbo Vision clone for the Free Pascal Compiler.
-
-Package: fp-extra
+Package: fp-packages
 Architecture: i386
 Depends: fp-compiler (= #PACKAGEVERSION#), fp-rtl (= #PACKAGEVERSION#)
 Description: Free Pascal Extra Packages
  Some different packages for the Free Pascal Compiler
- Bindings to libraries:
+ Graphics:
+   - Ncurses bindings
+   - Svgalib bindings
+   - GGI bindings
+   - OpenGL bindings
+ X11:
+   - GTK 1.2.x bindings
+   - Forms 0.88 bindings
+ Database:
    - MySql bindings
    - InterBase bindings
    - Postgres bindings
-   - Ncurses bindings
-   - Forms 0.88/0.86 bindings
-   - Svgalib bindings
  Other units:
    - Inet unit for easier tcp/ip handling
+   - API units for os independent keyboard/mouse/console handling
+     (used by Free Vision)
    - Uncgi unit
    - Utmp unit

+ 4 - 17
install/debian/copyright

@@ -2,21 +2,8 @@ The package was originally put together by:
   Peter Vreman <[email protected]>
 
 From sources obtained from:
-  ftp://tflily.fys.kuleuven.ac.be/pub/fpc/dist/linux/fpc-0.99.12.tar.gz
+  ftp://tflily.fys.kuleuven.ac.be/pub/fpc/dist/linux/fpc-0.99.13.tar.gz
 
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 dated June, 1991.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/doc/copyright/GPL'.
+The files and libraries are released under the terms of the GNU Library
+General Public License, which can be found in the file
+/usr/share/common-licenses/LGPL-2 on a Debian system.

+ 1 - 2
install/debian/fixdeb

@@ -18,6 +18,5 @@ echo 'FPCVersion    : ' $FPCVERSION
 for i in $1/*.in
 do
   j=${i/.in/}
-  sed -e s/'#FPCVERSION#'/$FPCVERSION/g $i > $j
-  sed -e s/'#PACKAGEVERSION#'/$PACKAGEVERSION/g $i > $j
+  sed -e 's/#FPCVERSION#/'$FPCVERSION'/g;s/#PACKAGEVERSION#/'$PACKAGEVERSION'/g' $i > $j
 done

+ 0 - 2
install/debian/fp-compiler.files.in

@@ -1,8 +1,6 @@
 /usr/lib/fpc/#FPCVERSION#/ppc386
 /usr/lib/fpc/#FPCVERSION#/samplecfg
 /usr/lib/fpc/#FPCVERSION#/msg
-/usr/lib/fpc/#FPCVERSION#/Makefile
-/usr/lib/fpc/#FPCVERSION#/makefile.fpc
 /usr/share/man/man1/ppc386.1
 /usr/share/man/man5/ppc386.cfg.5
 

+ 4 - 4
install/debian/fp-docs.docs.in

@@ -1,4 +1,4 @@
-debian/tmp/usr/doc/fpc/#FPCVERSION#/user.pdf
-debian/tmp/usr/doc/fpc/#FPCVERSION#/prog.pdf
-debian/tmp/usr/doc/fpc/#FPCVERSION#/ref.pdf
-debian/tmp/usr/doc/fpc/#FPCVERSION#/units.pdf
+debian/tmp/usr/share/doc/fpc/#FPCVERSION#/user.pdf
+debian/tmp/usr/share/doc/fpc/#FPCVERSION#/prog.pdf
+debian/tmp/usr/share/doc/fpc/#FPCVERSION#/ref.pdf
+debian/tmp/usr/share/doc/fpc/#FPCVERSION#/units.pdf

+ 37 - 42
install/debian/rules

@@ -1,26 +1,28 @@
 #!/usr/bin/make -f
 # debian/rules for Free Pascal
 
-# Don't load the system makefile.fpc
-export FPCMAKE=
+# Don't use the system FPCDIR
 export FPCDIR=
 
 # Documentation type to use pdf/html
 DOCTYPE=pdf
 
 # Get Package version and FPC version out of changelog file
-PACKAGEVERSION=$(shell head -n 1 debian/changelog | awk '{ print $$2 }' | tr -d '[()]')
-FPCVERSION=$(shell echo $(PACKAGEVERSION) | awk -F '-' '{ print $$1 }')
+PACKAGEVERSION:=$(shell head -n 1 debian/changelog | awk '{ print $$2 }' | tr -d '[()]')
+FPCVERSION:=$(shell echo $(PACKAGEVERSION) | awk -F '-' '{ print $$1 }')
 
 # Get directories	
-PWD=$(shell pwd)
+PWD:=$(shell pwd)
 BUILD_DIR=$(PWD)/debian/build
 INSTALL_DIR=$(PWD)/debian/tmp
 NEWPP=$(PWD)/compiler/ppc386
+NEWPPUFILES=$(PWD)/utils/ppufiles
 
-export DH_COMPAT=2
-#export DH_VERBOSE=1
+BUILDOPTS=PP=$(NEWPP)
+INSTALLOPTS=PP=$(NEWPP) PPUFILES=$(NEWPPUFILES) PREFIXINSTALLDIR=$(INSTALL_DIR)/usr
 
+export DH_COMPAT=2
+# export DH_VERBOSE=1
 
 ###################
 # Clean
@@ -35,20 +37,19 @@ clean:
 
 	rm -f debian-files-stamp
 	rm -f debian/*.files debian/*.docs debian/*.examples debian/*.postinst
-	
+
 	$(MAKE) compiler_clean
 	$(MAKE) rtl_clean
-	$(MAKE) utils_clean
 	$(MAKE) fcl_clean
-	$(MAKE) gtk_clean
-	$(MAKE) api_clean
-	$(MAKE) fv_clean
-	$(MAKE) -C packages clean
+	$(MAKE) utils_clean
+	$(MAKE) packages_clean
+
 	$(MAKE) -C docs clean
 
 	dh_clean
 
-	rm -f debian/control
+# Cannot do that because the control-file is often needed afetr a cleanup
+#	rm -f debian/control
 
 
 ###################
@@ -58,7 +59,7 @@ clean:
 debian-files: debian-files-stamp
 debian-files-stamp:
 	@echo "--- Creating debian files"
-	debian/fixdeb debian
+	bash debian/fixdeb debian
 
 	touch debian-files-stamp
 
@@ -68,53 +69,46 @@ debian-files-stamp:
 #
 
 build-arch: build-arch-stamp
-build-arch-stamp: debian-files
+build-arch-stamp: debian-files-stamp
 	@echo "--- Building"
 	dh_testdir
 
 # First make a new Compiler and RTL using a make cycle
 	$(MAKE) compiler_cycle
-	$(MAKE) utils_all PP=$(NEWPP)
-
-	$(MAKE) fcl_all PP=$(NEWPP)
-	$(MAKE) gtk_all PP=$(NEWPP)
-	$(MAKE) api_all PP=$(NEWPP)
-	$(MAKE) fv_all PP=$(NEWPP)
-	$(MAKE) -C packages all PP=$(NEWPP) RELEASE=1
+	$(MAKE) fcl_all $(BUILDOPTS)
+	$(MAKE) packages_all $(BUILDOPTS)
+	$(MAKE) utils_all $(BUILDOPTS)
 
 	touch build-arch-stamp
 
 
 install-arch: install-arch-stamp
-install-arch-stamp: build-arch debian-files
+install-arch-stamp: build-arch-stamp debian-files-stamp
 	@echo "--- Installing"
 	dh_testdir
 	dh_testroot
-	dh_clean
-
-# Specify the compiler to use so installing will do correctly
-	$(MAKE) compiler_install PP=$(NEWPP) PREFIXINSTALLDIR=$(INSTALL_DIR)/usr
-	$(MAKE) rtl_install PP=$(NEWPP) PREFIXINSTALLDIR=$(INSTALL_DIR)/usr
-	$(MAKE) utils_install PP=$(NEWPP) PREFIXINSTALLDIR=$(INSTALL_DIR)/usr
+	dh_clean -k
 
-	$(MAKE) base_install PP=$(NEWPP) PREFIXINSTALLDIR=$(INSTALL_DIR)/usr
-	$(MAKE) man_install PP=$(NEWPP) PREFIXINSTALLDIR=$(INSTALL_DIR)/usr/share
-	$(MAKE) demo_install PP=$(NEWPP) PREFIXINSTALLDIR=$(INSTALL_DIR)/usr
+# Specify the compiler to use so installing will use the correct versioned dir
+	$(MAKE) compiler_install $(INSTALLOPTS)
+	$(MAKE) rtl_install $(INSTALLOPTS)
+	$(MAKE) fcl_install $(INSTALLOPTS)
+	$(MAKE) utils_install $(INSTALLOPTS)
+	$(MAKE) packages install $(INSTALLOPTS)
 
-	$(MAKE) fcl_install PP=$(NEWPP) PREFIXINSTALLDIR=$(INSTALL_DIR)/usr
-	$(MAKE) gtk_install PP=$(NEWPP) PREFIXINSTALLDIR=$(INSTALL_DIR)/usr
-	$(MAKE) api_install PP=$(NEWPP) PREFIXINSTALLDIR=$(INSTALL_DIR)/usr
-	$(MAKE) fv_install PP=$(NEWPP) PREFIXINSTALLDIR=$(INSTALL_DIR)/usr
-	$(MAKE) -C packages install PP=$(NEWPP) PREFIXINSTALLDIR=$(INSTALL_DIR)/usr
+	$(MAKE) base_install $(INSTALLOPTS)
+	$(MAKE) man_install $(INSTALLOPTS) PREFIXINSTALLDIR=$(INSTALL_DIR)/usr/share
+	$(MAKE) demo_install $(INSTALLOPTS)
 
 	touch install-arch-stamp
 
+
 ###################
 # Documentation
 #
 
 build-indep: build-indep-stamp
-build-indep-stamp: debian-files
+build-indep-stamp: debian-files-stamp
 	@echo "--- Building Documentation"
 	dh_testdir
 
@@ -127,7 +121,7 @@ install-indep-stamp: debian-files build-indep
 	@echo "--- Installing Documentation"
 	dh_testdir
 	dh_testroot
-	dh_clean
+	dh_clean -k
 
 	$(MAKE) -C docs $(DOCTYPE)install DOCINSTALLDIR=$(INSTALL_DIR)/usr/share/doc/fpc/$(FPCVERSION)/
 
@@ -183,5 +177,6 @@ binary-arch: build-arch install-arch debian-files
 	dh_builddeb -a
 
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+.PHONY: build clean binary debian-files \
+        build-arch install-arch binary-arch \
+        binary-indep

+ 12 - 12
install/demo/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all
@@ -749,12 +749,12 @@ fpc_smart:
 fpc_shared: all
 ifdef inlinux
 ifndef LIBNAME
-	@$(ECHO) LIBNAME not set
+	@$(ECHO) "LIBNAME not set"
 else
 	$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)
 endif
 else
-	@$(ECHO) Shared Libraries not supported
+	@$(ECHO) "Shared Libraries not supported"
 endif
 
 #####################################################################
@@ -782,19 +782,19 @@ endif
 
 fpc_showinstall: $(SHOWINSTALLTARGET)
 ifdef INSTALLEXEFILES
-	@$(ECHO) $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
+	@$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
 endif
 ifdef INSTALLPPUFILES
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
 ifneq ($(INSTALLPPULINKFILES),)
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
 endif
 ifneq ($(INSTALLPPULIBFILES),)
-	@$(ECHO) $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
+	@$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
 endif
 endif
 ifdef EXTRAINSTALLFILES
-	@$(ECHO) $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
+	@$(ECHO) -e $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
 endif
 
 fpc_install: $(INSTALLTARGET)
@@ -863,8 +863,8 @@ endif
 # Note: This will not remove the zipfile first
 fpc_zipinstalladd:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
 ifdef inlinux
@@ -880,8 +880,8 @@ endif
 # First remove the zip and then install
 fpc_zipinstall:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)

+ 12 - 12
install/fpinst/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all
@@ -769,12 +769,12 @@ fpc_smart:
 fpc_shared: all
 ifdef inlinux
 ifndef LIBNAME
-	@$(ECHO) LIBNAME not set
+	@$(ECHO) "LIBNAME not set"
 else
 	$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)
 endif
 else
-	@$(ECHO) Shared Libraries not supported
+	@$(ECHO) "Shared Libraries not supported"
 endif
 
 #####################################################################
@@ -802,19 +802,19 @@ endif
 
 fpc_showinstall: $(SHOWINSTALLTARGET)
 ifdef INSTALLEXEFILES
-	@$(ECHO) $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
+	@$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
 endif
 ifdef INSTALLPPUFILES
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
 ifneq ($(INSTALLPPULINKFILES),)
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
 endif
 ifneq ($(INSTALLPPULIBFILES),)
-	@$(ECHO) $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
+	@$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
 endif
 endif
 ifdef EXTRAINSTALLFILES
-	@$(ECHO) $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
+	@$(ECHO) -e $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
 endif
 
 fpc_install: $(INSTALLTARGET)
@@ -883,8 +883,8 @@ endif
 # Note: This will not remove the zipfile first
 fpc_zipinstalladd:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
 ifdef inlinux
@@ -900,8 +900,8 @@ endif
 # First remove the zip and then install
 fpc_zipinstall:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)

+ 54 - 2
packages/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all
@@ -138,7 +138,7 @@ endif
 
 override DIROBJECTS+=$(wildcard ibase mysql uncgi paszlib gdbint api fv)
 ifeq ($(OS_TARGET),linux)
-override DIROBJECTS+=$(wildcard gtk opengl utmp inet postgres ncurses forms svgalib ggi zlib)
+override DIROBJECTS+=$(wildcard gtk opengl utmp inet postgres ncurses x11 forms svgalib ggi zlib)
 endif
 ifeq ($(OS_TARGET),win32)
 override DIROBJECTS+=$(wildcard gtk opengl)
@@ -230,6 +230,7 @@ OBJECTDIRUTMP=1
 OBJECTDIRINET=1
 OBJECTDIRPOSTGRES=1
 OBJECTDIRNCURSES=1
+OBJECTDIRX11=1
 OBJECTDIRFORMS=1
 OBJECTDIRSVGALIB=1
 OBJECTDIRGGI=1
@@ -903,6 +904,57 @@ ncurses_info:
 	$(MAKE) -C ncurses info
 endif
 
+# Dir x11
+
+ifdef OBJECTDIRX11
+.PHONY:  x11_all x11_debug x11_examples x11_test x11_smart x11_shared x11_showinstall x11_install x11_sourceinstall x11_zipinstall x11_zipinstalladd x11_clean x11_cleanall x11_depend x11_info
+
+x11_all:
+	$(MAKE) -C x11 all
+
+x11_debug:
+	$(MAKE) -C x11 debug
+
+x11_examples:
+	$(MAKE) -C x11 examples
+
+x11_test:
+	$(MAKE) -C x11 test
+
+x11_smart:
+	$(MAKE) -C x11 smart
+
+x11_shared:
+	$(MAKE) -C x11 shared
+
+x11_showinstall:
+	$(MAKE) -C x11 showinstall
+
+x11_install:
+	$(MAKE) -C x11 install
+
+x11_sourceinstall:
+	$(MAKE) -C x11 sourceinstall
+
+x11_zipinstall:
+	$(MAKE) -C x11 zipinstall
+
+x11_zipinstalladd:
+	$(MAKE) -C x11 zipinstalladd
+
+x11_clean:
+	$(MAKE) -C x11 clean
+
+x11_cleanall:
+	$(MAKE) -C x11 cleanall
+
+x11_depend:
+	$(MAKE) -C x11 depend
+
+x11_info:
+	$(MAKE) -C x11 info
+endif
+
 # Dir forms
 
 ifdef OBJECTDIRFORMS

+ 2 - 2
packages/Makefile.fpc

@@ -3,8 +3,8 @@
 #
 
 [targets]
-dirs=ibase mysql uncgi paszlib gdbint api fv 
-dirs_linux=gtk opengl utmp inet postgres ncurses forms svgalib ggi zlib
+dirs=ibase mysql uncgi paszlib gdbint api fv
+dirs_linux=gtk opengl utmp inet postgres ncurses x11 forms svgalib ggi zlib
 dirs_win32=gtk opengl
 
 [sections]

+ 12 - 12
packages/gdbint/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all
@@ -791,12 +791,12 @@ fpc_smart:
 fpc_shared: all
 ifdef inlinux
 ifndef LIBNAME
-	@$(ECHO) LIBNAME not set
+	@$(ECHO) "LIBNAME not set"
 else
 	$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)
 endif
 else
-	@$(ECHO) Shared Libraries not supported
+	@$(ECHO) "Shared Libraries not supported"
 endif
 
 #####################################################################
@@ -824,19 +824,19 @@ endif
 
 fpc_showinstall: $(SHOWINSTALLTARGET)
 ifdef INSTALLEXEFILES
-	@$(ECHO) $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
+	@$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
 endif
 ifdef INSTALLPPUFILES
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
 ifneq ($(INSTALLPPULINKFILES),)
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
 endif
 ifneq ($(INSTALLPPULIBFILES),)
-	@$(ECHO) $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
+	@$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
 endif
 endif
 ifdef EXTRAINSTALLFILES
-	@$(ECHO) $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
+	@$(ECHO) -e $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
 endif
 
 fpc_install: $(INSTALLTARGET)
@@ -905,8 +905,8 @@ endif
 # Note: This will not remove the zipfile first
 fpc_zipinstalladd:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
 ifdef inlinux
@@ -922,8 +922,8 @@ endif
 # First remove the zip and then install
 fpc_zipinstall:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)

+ 1 - 1
packages/gdbint/libgdb/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all

+ 12 - 12
packages/ggi/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all
@@ -746,12 +746,12 @@ fpc_smart:
 fpc_shared: all
 ifdef inlinux
 ifndef LIBNAME
-	@$(ECHO) LIBNAME not set
+	@$(ECHO) "LIBNAME not set"
 else
 	$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)
 endif
 else
-	@$(ECHO) Shared Libraries not supported
+	@$(ECHO) "Shared Libraries not supported"
 endif
 
 #####################################################################
@@ -779,19 +779,19 @@ endif
 
 fpc_showinstall: $(SHOWINSTALLTARGET)
 ifdef INSTALLEXEFILES
-	@$(ECHO) $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
+	@$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
 endif
 ifdef INSTALLPPUFILES
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
 ifneq ($(INSTALLPPULINKFILES),)
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
 endif
 ifneq ($(INSTALLPPULIBFILES),)
-	@$(ECHO) $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
+	@$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
 endif
 endif
 ifdef EXTRAINSTALLFILES
-	@$(ECHO) $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
+	@$(ECHO) -e $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
 endif
 
 fpc_install: $(INSTALLTARGET)
@@ -860,8 +860,8 @@ endif
 # Note: This will not remove the zipfile first
 fpc_zipinstalladd:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
 ifdef inlinux
@@ -877,8 +877,8 @@ endif
 # First remove the zip and then install
 fpc_zipinstall:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)

+ 12 - 12
packages/gtk/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all
@@ -734,12 +734,12 @@ fpc_smart:
 fpc_shared: all
 ifdef inlinux
 ifndef LIBNAME
-	@$(ECHO) LIBNAME not set
+	@$(ECHO) "LIBNAME not set"
 else
 	$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)
 endif
 else
-	@$(ECHO) Shared Libraries not supported
+	@$(ECHO) "Shared Libraries not supported"
 endif
 
 #####################################################################
@@ -767,19 +767,19 @@ endif
 
 fpc_showinstall: $(SHOWINSTALLTARGET)
 ifdef INSTALLEXEFILES
-	@$(ECHO) $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
+	@$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
 endif
 ifdef INSTALLPPUFILES
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
 ifneq ($(INSTALLPPULINKFILES),)
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
 endif
 ifneq ($(INSTALLPPULIBFILES),)
-	@$(ECHO) $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
+	@$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
 endif
 endif
 ifdef EXTRAINSTALLFILES
-	@$(ECHO) $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
+	@$(ECHO) -e $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
 endif
 
 fpc_install: $(INSTALLTARGET)
@@ -848,8 +848,8 @@ endif
 # Note: This will not remove the zipfile first
 fpc_zipinstalladd:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
 ifdef inlinux
@@ -865,8 +865,8 @@ endif
 # First remove the zip and then install
 fpc_zipinstall:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)

+ 12 - 12
packages/gtk/examples/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all
@@ -767,12 +767,12 @@ fpc_smart:
 fpc_shared: all
 ifdef inlinux
 ifndef LIBNAME
-	@$(ECHO) LIBNAME not set
+	@$(ECHO) "LIBNAME not set"
 else
 	$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)
 endif
 else
-	@$(ECHO) Shared Libraries not supported
+	@$(ECHO) "Shared Libraries not supported"
 endif
 
 #####################################################################
@@ -800,19 +800,19 @@ endif
 
 fpc_showinstall: $(SHOWINSTALLTARGET)
 ifdef INSTALLEXEFILES
-	@$(ECHO) $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
+	@$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
 endif
 ifdef INSTALLPPUFILES
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
 ifneq ($(INSTALLPPULINKFILES),)
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
 endif
 ifneq ($(INSTALLPPULIBFILES),)
-	@$(ECHO) $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
+	@$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
 endif
 endif
 ifdef EXTRAINSTALLFILES
-	@$(ECHO) $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
+	@$(ECHO) -e $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
 endif
 
 fpc_install: $(INSTALLTARGET)
@@ -881,8 +881,8 @@ endif
 # Note: This will not remove the zipfile first
 fpc_zipinstalladd:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
 ifdef inlinux
@@ -898,8 +898,8 @@ endif
 # First remove the zip and then install
 fpc_zipinstall:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)

+ 12 - 12
packages/gtk/tutorial/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all
@@ -766,12 +766,12 @@ fpc_smart:
 fpc_shared: all
 ifdef inlinux
 ifndef LIBNAME
-	@$(ECHO) LIBNAME not set
+	@$(ECHO) "LIBNAME not set"
 else
 	$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)
 endif
 else
-	@$(ECHO) Shared Libraries not supported
+	@$(ECHO) "Shared Libraries not supported"
 endif
 
 #####################################################################
@@ -799,19 +799,19 @@ endif
 
 fpc_showinstall: $(SHOWINSTALLTARGET)
 ifdef INSTALLEXEFILES
-	@$(ECHO) $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
+	@$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
 endif
 ifdef INSTALLPPUFILES
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
 ifneq ($(INSTALLPPULINKFILES),)
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
 endif
 ifneq ($(INSTALLPPULIBFILES),)
-	@$(ECHO) $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
+	@$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
 endif
 endif
 ifdef EXTRAINSTALLFILES
-	@$(ECHO) $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
+	@$(ECHO) -e $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
 endif
 
 fpc_install: $(INSTALLTARGET)
@@ -880,8 +880,8 @@ endif
 # Note: This will not remove the zipfile first
 fpc_zipinstalladd:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
 ifdef inlinux
@@ -897,8 +897,8 @@ endif
 # First remove the zip and then install
 fpc_zipinstall:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)

+ 12 - 12
packages/ibase/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all
@@ -746,12 +746,12 @@ fpc_smart:
 fpc_shared: all
 ifdef inlinux
 ifndef LIBNAME
-	@$(ECHO) LIBNAME not set
+	@$(ECHO) "LIBNAME not set"
 else
 	$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)
 endif
 else
-	@$(ECHO) Shared Libraries not supported
+	@$(ECHO) "Shared Libraries not supported"
 endif
 
 #####################################################################
@@ -779,19 +779,19 @@ endif
 
 fpc_showinstall: $(SHOWINSTALLTARGET)
 ifdef INSTALLEXEFILES
-	@$(ECHO) $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
+	@$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
 endif
 ifdef INSTALLPPUFILES
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
 ifneq ($(INSTALLPPULINKFILES),)
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
 endif
 ifneq ($(INSTALLPPULIBFILES),)
-	@$(ECHO) $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
+	@$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
 endif
 endif
 ifdef EXTRAINSTALLFILES
-	@$(ECHO) $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
+	@$(ECHO) -e $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
 endif
 
 fpc_install: $(INSTALLTARGET)
@@ -860,8 +860,8 @@ endif
 # Note: This will not remove the zipfile first
 fpc_zipinstalladd:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
 ifdef inlinux
@@ -877,8 +877,8 @@ endif
 # First remove the zip and then install
 fpc_zipinstall:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)

+ 12 - 12
packages/inet/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all
@@ -746,12 +746,12 @@ fpc_smart:
 fpc_shared: all
 ifdef inlinux
 ifndef LIBNAME
-	@$(ECHO) LIBNAME not set
+	@$(ECHO) "LIBNAME not set"
 else
 	$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)
 endif
 else
-	@$(ECHO) Shared Libraries not supported
+	@$(ECHO) "Shared Libraries not supported"
 endif
 
 #####################################################################
@@ -779,19 +779,19 @@ endif
 
 fpc_showinstall: $(SHOWINSTALLTARGET)
 ifdef INSTALLEXEFILES
-	@$(ECHO) $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
+	@$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
 endif
 ifdef INSTALLPPUFILES
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
 ifneq ($(INSTALLPPULINKFILES),)
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
 endif
 ifneq ($(INSTALLPPULIBFILES),)
-	@$(ECHO) $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
+	@$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
 endif
 endif
 ifdef EXTRAINSTALLFILES
-	@$(ECHO) $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
+	@$(ECHO) -e $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
 endif
 
 fpc_install: $(INSTALLTARGET)
@@ -860,8 +860,8 @@ endif
 # Note: This will not remove the zipfile first
 fpc_zipinstalladd:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
 ifdef inlinux
@@ -877,8 +877,8 @@ endif
 # First remove the zip and then install
 fpc_zipinstall:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)

+ 12 - 12
packages/mysql/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all
@@ -746,12 +746,12 @@ fpc_smart:
 fpc_shared: all
 ifdef inlinux
 ifndef LIBNAME
-	@$(ECHO) LIBNAME not set
+	@$(ECHO) "LIBNAME not set"
 else
 	$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)
 endif
 else
-	@$(ECHO) Shared Libraries not supported
+	@$(ECHO) "Shared Libraries not supported"
 endif
 
 #####################################################################
@@ -779,19 +779,19 @@ endif
 
 fpc_showinstall: $(SHOWINSTALLTARGET)
 ifdef INSTALLEXEFILES
-	@$(ECHO) $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
+	@$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
 endif
 ifdef INSTALLPPUFILES
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
 ifneq ($(INSTALLPPULINKFILES),)
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
 endif
 ifneq ($(INSTALLPPULIBFILES),)
-	@$(ECHO) $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
+	@$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
 endif
 endif
 ifdef EXTRAINSTALLFILES
-	@$(ECHO) $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
+	@$(ECHO) -e $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
 endif
 
 fpc_install: $(INSTALLTARGET)
@@ -860,8 +860,8 @@ endif
 # Note: This will not remove the zipfile first
 fpc_zipinstalladd:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
 ifdef inlinux
@@ -877,8 +877,8 @@ endif
 # First remove the zip and then install
 fpc_zipinstall:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)

+ 12 - 12
packages/ncurses/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all
@@ -746,12 +746,12 @@ fpc_smart:
 fpc_shared: all
 ifdef inlinux
 ifndef LIBNAME
-	@$(ECHO) LIBNAME not set
+	@$(ECHO) "LIBNAME not set"
 else
 	$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)
 endif
 else
-	@$(ECHO) Shared Libraries not supported
+	@$(ECHO) "Shared Libraries not supported"
 endif
 
 #####################################################################
@@ -779,19 +779,19 @@ endif
 
 fpc_showinstall: $(SHOWINSTALLTARGET)
 ifdef INSTALLEXEFILES
-	@$(ECHO) $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
+	@$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
 endif
 ifdef INSTALLPPUFILES
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
 ifneq ($(INSTALLPPULINKFILES),)
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
 endif
 ifneq ($(INSTALLPPULIBFILES),)
-	@$(ECHO) $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
+	@$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
 endif
 endif
 ifdef EXTRAINSTALLFILES
-	@$(ECHO) $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
+	@$(ECHO) -e $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
 endif
 
 fpc_install: $(INSTALLTARGET)
@@ -860,8 +860,8 @@ endif
 # Note: This will not remove the zipfile first
 fpc_zipinstalladd:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
 ifdef inlinux
@@ -877,8 +877,8 @@ endif
 # First remove the zip and then install
 fpc_zipinstall:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)

+ 12 - 12
packages/paszlib/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all
@@ -751,12 +751,12 @@ fpc_smart:
 fpc_shared: all
 ifdef inlinux
 ifndef LIBNAME
-	@$(ECHO) LIBNAME not set
+	@$(ECHO) "LIBNAME not set"
 else
 	$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)
 endif
 else
-	@$(ECHO) Shared Libraries not supported
+	@$(ECHO) "Shared Libraries not supported"
 endif
 
 #####################################################################
@@ -784,19 +784,19 @@ endif
 
 fpc_showinstall: $(SHOWINSTALLTARGET)
 ifdef INSTALLEXEFILES
-	@$(ECHO) $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
+	@$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
 endif
 ifdef INSTALLPPUFILES
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
 ifneq ($(INSTALLPPULINKFILES),)
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
 endif
 ifneq ($(INSTALLPPULIBFILES),)
-	@$(ECHO) $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
+	@$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
 endif
 endif
 ifdef EXTRAINSTALLFILES
-	@$(ECHO) $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
+	@$(ECHO) -e $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
 endif
 
 fpc_install: $(INSTALLTARGET)
@@ -865,8 +865,8 @@ endif
 # Note: This will not remove the zipfile first
 fpc_zipinstalladd:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
 ifdef inlinux
@@ -882,8 +882,8 @@ endif
 # First remove the zip and then install
 fpc_zipinstall:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)

+ 12 - 12
packages/postgres/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all
@@ -746,12 +746,12 @@ fpc_smart:
 fpc_shared: all
 ifdef inlinux
 ifndef LIBNAME
-	@$(ECHO) LIBNAME not set
+	@$(ECHO) "LIBNAME not set"
 else
 	$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)
 endif
 else
-	@$(ECHO) Shared Libraries not supported
+	@$(ECHO) "Shared Libraries not supported"
 endif
 
 #####################################################################
@@ -779,19 +779,19 @@ endif
 
 fpc_showinstall: $(SHOWINSTALLTARGET)
 ifdef INSTALLEXEFILES
-	@$(ECHO) $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
+	@$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
 endif
 ifdef INSTALLPPUFILES
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
 ifneq ($(INSTALLPPULINKFILES),)
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
 endif
 ifneq ($(INSTALLPPULIBFILES),)
-	@$(ECHO) $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
+	@$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
 endif
 endif
 ifdef EXTRAINSTALLFILES
-	@$(ECHO) $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
+	@$(ECHO) -e $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
 endif
 
 fpc_install: $(INSTALLTARGET)
@@ -860,8 +860,8 @@ endif
 # Note: This will not remove the zipfile first
 fpc_zipinstalladd:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
 ifdef inlinux
@@ -877,8 +877,8 @@ endif
 # First remove the zip and then install
 fpc_zipinstall:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)

+ 12 - 12
packages/svgalib/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all
@@ -746,12 +746,12 @@ fpc_smart:
 fpc_shared: all
 ifdef inlinux
 ifndef LIBNAME
-	@$(ECHO) LIBNAME not set
+	@$(ECHO) "LIBNAME not set"
 else
 	$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)
 endif
 else
-	@$(ECHO) Shared Libraries not supported
+	@$(ECHO) "Shared Libraries not supported"
 endif
 
 #####################################################################
@@ -779,19 +779,19 @@ endif
 
 fpc_showinstall: $(SHOWINSTALLTARGET)
 ifdef INSTALLEXEFILES
-	@$(ECHO) $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
+	@$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
 endif
 ifdef INSTALLPPUFILES
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
 ifneq ($(INSTALLPPULINKFILES),)
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
 endif
 ifneq ($(INSTALLPPULIBFILES),)
-	@$(ECHO) $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
+	@$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
 endif
 endif
 ifdef EXTRAINSTALLFILES
-	@$(ECHO) $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
+	@$(ECHO) -e $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
 endif
 
 fpc_install: $(INSTALLTARGET)
@@ -860,8 +860,8 @@ endif
 # Note: This will not remove the zipfile first
 fpc_zipinstalladd:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
 ifdef inlinux
@@ -877,8 +877,8 @@ endif
 # First remove the zip and then install
 fpc_zipinstall:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)

+ 12 - 12
packages/uncgi/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all
@@ -746,12 +746,12 @@ fpc_smart:
 fpc_shared: all
 ifdef inlinux
 ifndef LIBNAME
-	@$(ECHO) LIBNAME not set
+	@$(ECHO) "LIBNAME not set"
 else
 	$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)
 endif
 else
-	@$(ECHO) Shared Libraries not supported
+	@$(ECHO) "Shared Libraries not supported"
 endif
 
 #####################################################################
@@ -779,19 +779,19 @@ endif
 
 fpc_showinstall: $(SHOWINSTALLTARGET)
 ifdef INSTALLEXEFILES
-	@$(ECHO) $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
+	@$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
 endif
 ifdef INSTALLPPUFILES
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
 ifneq ($(INSTALLPPULINKFILES),)
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
 endif
 ifneq ($(INSTALLPPULIBFILES),)
-	@$(ECHO) $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
+	@$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
 endif
 endif
 ifdef EXTRAINSTALLFILES
-	@$(ECHO) $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
+	@$(ECHO) -e $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
 endif
 
 fpc_install: $(INSTALLTARGET)
@@ -860,8 +860,8 @@ endif
 # Note: This will not remove the zipfile first
 fpc_zipinstalladd:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
 ifdef inlinux
@@ -877,8 +877,8 @@ endif
 # First remove the zip and then install
 fpc_zipinstall:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)

+ 12 - 12
packages/utmp/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all
@@ -746,12 +746,12 @@ fpc_smart:
 fpc_shared: all
 ifdef inlinux
 ifndef LIBNAME
-	@$(ECHO) LIBNAME not set
+	@$(ECHO) "LIBNAME not set"
 else
 	$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)
 endif
 else
-	@$(ECHO) Shared Libraries not supported
+	@$(ECHO) "Shared Libraries not supported"
 endif
 
 #####################################################################
@@ -779,19 +779,19 @@ endif
 
 fpc_showinstall: $(SHOWINSTALLTARGET)
 ifdef INSTALLEXEFILES
-	@$(ECHO) $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
+	@$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
 endif
 ifdef INSTALLPPUFILES
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
 ifneq ($(INSTALLPPULINKFILES),)
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
 endif
 ifneq ($(INSTALLPPULIBFILES),)
-	@$(ECHO) $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
+	@$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
 endif
 endif
 ifdef EXTRAINSTALLFILES
-	@$(ECHO) $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
+	@$(ECHO) -e $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
 endif
 
 fpc_install: $(INSTALLTARGET)
@@ -860,8 +860,8 @@ endif
 # Note: This will not remove the zipfile first
 fpc_zipinstalladd:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
 ifdef inlinux
@@ -877,8 +877,8 @@ endif
 # First remove the zip and then install
 fpc_zipinstall:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)

+ 16 - 16
rtl/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all
@@ -167,35 +167,35 @@ endif
 # Standard rules
 #####################################################################
 
-all: $(OS_TARGET)_all
+all: $(addsuffix _all,$(OS_TARGET))
 
-debug: $(OS_TARGET)_debug
+debug: $(addsuffix _debug,$(OS_TARGET))
 
-examples: $(OS_TARGET)_examples
+examples: $(addsuffix _examples,$(OS_TARGET))
 
-test: $(OS_TARGET)_test
+test: $(addsuffix _test,$(OS_TARGET))
 
-smart: $(OS_TARGET)_smart
+smart: $(addsuffix _smart,$(OS_TARGET))
 
-shared: $(OS_TARGET)_shared
+shared: $(addsuffix _shared,$(OS_TARGET))
 
-showinstall: $(OS_TARGET)_showinstall
+showinstall: $(addsuffix _showinstall,$(OS_TARGET))
 
-install: $(OS_TARGET)_install
+install: $(addsuffix _install,$(OS_TARGET))
 
-sourceinstall: $(OS_TARGET)_sourceinstall
+sourceinstall: $(addsuffix _sourceinstall,$(OS_TARGET))
 
-zipinstall: $(OS_TARGET)_zipinstall
+zipinstall: $(addsuffix _zipinstall,$(OS_TARGET))
 
-zipinstalladd: $(OS_TARGET)_zipinstalladd
+zipinstalladd: $(addsuffix _zipinstalladd,$(OS_TARGET))
 
-clean: $(OS_TARGET)_clean
+clean: $(addsuffix _clean,$(OS_TARGET))
 
-cleanall: $(OS_TARGET)_cleanall
+cleanall: $(addsuffix _cleanall,$(OS_TARGET))
 
-depend: $(OS_TARGET)_depend
+depend: $(addsuffix _depend,$(OS_TARGET))
 
-info: $(OS_TARGET)_info
+info: $(addsuffix _info,$(OS_TARGET))
 
 .PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipinstalladd clean cleanall depend info
 

+ 13 - 13
rtl/go32v1/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all
@@ -728,7 +728,7 @@ fpc_loaders_clean:
 	-$(DEL) $(LOADEROFILES)
 
 fpc_loaders_showinstall:
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(LOADEROFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(LOADEROFILES))
 
 fpc_loaders_install:
 	$(MKDIR) $(UNITINSTALLDIR)
@@ -801,12 +801,12 @@ fpc_smart:
 fpc_shared: all
 ifdef inlinux
 ifndef LIBNAME
-	@$(ECHO) LIBNAME not set
+	@$(ECHO) "LIBNAME not set"
 else
 	$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)
 endif
 else
-	@$(ECHO) Shared Libraries not supported
+	@$(ECHO) "Shared Libraries not supported"
 endif
 
 #####################################################################
@@ -834,19 +834,19 @@ endif
 
 fpc_showinstall: $(SHOWINSTALLTARGET)
 ifdef INSTALLEXEFILES
-	@$(ECHO) $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
+	@$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
 endif
 ifdef INSTALLPPUFILES
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
 ifneq ($(INSTALLPPULINKFILES),)
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
 endif
 ifneq ($(INSTALLPPULIBFILES),)
-	@$(ECHO) $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
+	@$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
 endif
 endif
 ifdef EXTRAINSTALLFILES
-	@$(ECHO) $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
+	@$(ECHO) -e $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
 endif
 
 fpc_install: $(INSTALLTARGET)
@@ -915,8 +915,8 @@ endif
 # Note: This will not remove the zipfile first
 fpc_zipinstalladd:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
 ifdef inlinux
@@ -932,8 +932,8 @@ endif
 # First remove the zip and then install
 fpc_zipinstall:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)

+ 13 - 13
rtl/go32v2/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all
@@ -728,7 +728,7 @@ fpc_loaders_clean:
 	-$(DEL) $(LOADEROFILES)
 
 fpc_loaders_showinstall:
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(LOADEROFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(LOADEROFILES))
 
 fpc_loaders_install:
 	$(MKDIR) $(UNITINSTALLDIR)
@@ -801,12 +801,12 @@ fpc_smart:
 fpc_shared: all
 ifdef inlinux
 ifndef LIBNAME
-	@$(ECHO) LIBNAME not set
+	@$(ECHO) "LIBNAME not set"
 else
 	$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)
 endif
 else
-	@$(ECHO) Shared Libraries not supported
+	@$(ECHO) "Shared Libraries not supported"
 endif
 
 #####################################################################
@@ -834,19 +834,19 @@ endif
 
 fpc_showinstall: $(SHOWINSTALLTARGET)
 ifdef INSTALLEXEFILES
-	@$(ECHO) $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
+	@$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
 endif
 ifdef INSTALLPPUFILES
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
 ifneq ($(INSTALLPPULINKFILES),)
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
 endif
 ifneq ($(INSTALLPPULIBFILES),)
-	@$(ECHO) $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
+	@$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
 endif
 endif
 ifdef EXTRAINSTALLFILES
-	@$(ECHO) $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
+	@$(ECHO) -e $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
 endif
 
 fpc_install: $(INSTALLTARGET)
@@ -915,8 +915,8 @@ endif
 # Note: This will not remove the zipfile first
 fpc_zipinstalladd:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
 ifdef inlinux
@@ -932,8 +932,8 @@ endif
 # First remove the zip and then install
 fpc_zipinstall:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)

+ 13 - 13
rtl/linux/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all
@@ -739,7 +739,7 @@ fpc_loaders_clean:
 	-$(DEL) $(LOADEROFILES)
 
 fpc_loaders_showinstall:
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(LOADEROFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(LOADEROFILES))
 
 fpc_loaders_install:
 	$(MKDIR) $(UNITINSTALLDIR)
@@ -812,12 +812,12 @@ fpc_smart:
 fpc_shared: all
 ifdef inlinux
 ifndef LIBNAME
-	@$(ECHO) LIBNAME not set
+	@$(ECHO) "LIBNAME not set"
 else
 	$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)
 endif
 else
-	@$(ECHO) Shared Libraries not supported
+	@$(ECHO) "Shared Libraries not supported"
 endif
 
 #####################################################################
@@ -845,19 +845,19 @@ endif
 
 fpc_showinstall: $(SHOWINSTALLTARGET)
 ifdef INSTALLEXEFILES
-	@$(ECHO) $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
+	@$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
 endif
 ifdef INSTALLPPUFILES
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
 ifneq ($(INSTALLPPULINKFILES),)
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
 endif
 ifneq ($(INSTALLPPULIBFILES),)
-	@$(ECHO) $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
+	@$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
 endif
 endif
 ifdef EXTRAINSTALLFILES
-	@$(ECHO) $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
+	@$(ECHO) -e $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
 endif
 
 fpc_install: $(INSTALLTARGET)
@@ -926,8 +926,8 @@ endif
 # Note: This will not remove the zipfile first
 fpc_zipinstalladd:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
 ifdef inlinux
@@ -943,8 +943,8 @@ endif
 # First remove the zip and then install
 fpc_zipinstall:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)

+ 13 - 13
rtl/os2/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all
@@ -728,7 +728,7 @@ fpc_loaders_clean:
 	-$(DEL) $(LOADEROFILES)
 
 fpc_loaders_showinstall:
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(LOADEROFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(LOADEROFILES))
 
 fpc_loaders_install:
 	$(MKDIR) $(UNITINSTALLDIR)
@@ -801,12 +801,12 @@ fpc_smart:
 fpc_shared: all
 ifdef inlinux
 ifndef LIBNAME
-	@$(ECHO) LIBNAME not set
+	@$(ECHO) "LIBNAME not set"
 else
 	$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)
 endif
 else
-	@$(ECHO) Shared Libraries not supported
+	@$(ECHO) "Shared Libraries not supported"
 endif
 
 #####################################################################
@@ -834,19 +834,19 @@ endif
 
 fpc_showinstall: $(SHOWINSTALLTARGET)
 ifdef INSTALLEXEFILES
-	@$(ECHO) $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
+	@$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
 endif
 ifdef INSTALLPPUFILES
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
 ifneq ($(INSTALLPPULINKFILES),)
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
 endif
 ifneq ($(INSTALLPPULIBFILES),)
-	@$(ECHO) $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
+	@$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
 endif
 endif
 ifdef EXTRAINSTALLFILES
-	@$(ECHO) $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
+	@$(ECHO) -e $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
 endif
 
 fpc_install: $(INSTALLTARGET)
@@ -915,8 +915,8 @@ endif
 # Note: This will not remove the zipfile first
 fpc_zipinstalladd:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
 ifdef inlinux
@@ -932,8 +932,8 @@ endif
 # First remove the zip and then install
 fpc_zipinstall:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)

+ 13 - 13
rtl/win32/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all
@@ -733,7 +733,7 @@ fpc_loaders_clean:
 	-$(DEL) $(LOADEROFILES)
 
 fpc_loaders_showinstall:
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(LOADEROFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(LOADEROFILES))
 
 fpc_loaders_install:
 	$(MKDIR) $(UNITINSTALLDIR)
@@ -806,12 +806,12 @@ fpc_smart:
 fpc_shared: all
 ifdef inlinux
 ifndef LIBNAME
-	@$(ECHO) LIBNAME not set
+	@$(ECHO) "LIBNAME not set"
 else
 	$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)
 endif
 else
-	@$(ECHO) Shared Libraries not supported
+	@$(ECHO) "Shared Libraries not supported"
 endif
 
 #####################################################################
@@ -839,19 +839,19 @@ endif
 
 fpc_showinstall: $(SHOWINSTALLTARGET)
 ifdef INSTALLEXEFILES
-	@$(ECHO) $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
+	@$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
 endif
 ifdef INSTALLPPUFILES
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
 ifneq ($(INSTALLPPULINKFILES),)
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
 endif
 ifneq ($(INSTALLPPULIBFILES),)
-	@$(ECHO) $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
+	@$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
 endif
 endif
 ifdef EXTRAINSTALLFILES
-	@$(ECHO) $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
+	@$(ECHO) -e $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
 endif
 
 fpc_install: $(INSTALLTARGET)
@@ -920,8 +920,8 @@ endif
 # Note: This will not remove the zipfile first
 fpc_zipinstalladd:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
 ifdef inlinux
@@ -937,8 +937,8 @@ endif
 # First remove the zip and then install
 fpc_zipinstall:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)

+ 1 - 1
tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: info

+ 12 - 12
utils/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all
@@ -765,12 +765,12 @@ fpc_smart:
 fpc_shared: all
 ifdef inlinux
 ifndef LIBNAME
-	@$(ECHO) LIBNAME not set
+	@$(ECHO) "LIBNAME not set"
 else
 	$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)
 endif
 else
-	@$(ECHO) Shared Libraries not supported
+	@$(ECHO) "Shared Libraries not supported"
 endif
 
 #####################################################################
@@ -798,19 +798,19 @@ endif
 
 fpc_showinstall: $(SHOWINSTALLTARGET)
 ifdef INSTALLEXEFILES
-	@$(ECHO) $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
+	@$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
 endif
 ifdef INSTALLPPUFILES
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
 ifneq ($(INSTALLPPULINKFILES),)
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
 endif
 ifneq ($(INSTALLPPULIBFILES),)
-	@$(ECHO) $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
+	@$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
 endif
 endif
 ifdef EXTRAINSTALLFILES
-	@$(ECHO) $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
+	@$(ECHO) -e $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
 endif
 
 fpc_install: $(INSTALLTARGET)
@@ -879,8 +879,8 @@ endif
 # Note: This will not remove the zipfile first
 fpc_zipinstalladd:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
 ifdef inlinux
@@ -896,8 +896,8 @@ endif
 # First remove the zip and then install
 fpc_zipinstall:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)

+ 12 - 12
utils/h2pas/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all
@@ -733,12 +733,12 @@ fpc_smart:
 fpc_shared: all
 ifdef inlinux
 ifndef LIBNAME
-	@$(ECHO) LIBNAME not set
+	@$(ECHO) "LIBNAME not set"
 else
 	$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)
 endif
 else
-	@$(ECHO) Shared Libraries not supported
+	@$(ECHO) "Shared Libraries not supported"
 endif
 
 #####################################################################
@@ -766,19 +766,19 @@ endif
 
 fpc_showinstall: $(SHOWINSTALLTARGET)
 ifdef INSTALLEXEFILES
-	@$(ECHO) $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
+	@$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
 endif
 ifdef INSTALLPPUFILES
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
 ifneq ($(INSTALLPPULINKFILES),)
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
 endif
 ifneq ($(INSTALLPPULIBFILES),)
-	@$(ECHO) $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
+	@$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
 endif
 endif
 ifdef EXTRAINSTALLFILES
-	@$(ECHO) $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
+	@$(ECHO) -e $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
 endif
 
 fpc_install: $(INSTALLTARGET)
@@ -847,8 +847,8 @@ endif
 # Note: This will not remove the zipfile first
 fpc_zipinstalladd:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
 ifdef inlinux
@@ -864,8 +864,8 @@ endif
 # First remove the zip and then install
 fpc_zipinstall:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)

+ 12 - 12
utils/simulator/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all
@@ -728,12 +728,12 @@ fpc_smart:
 fpc_shared: all
 ifdef inlinux
 ifndef LIBNAME
-	@$(ECHO) LIBNAME not set
+	@$(ECHO) "LIBNAME not set"
 else
 	$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)
 endif
 else
-	@$(ECHO) Shared Libraries not supported
+	@$(ECHO) "Shared Libraries not supported"
 endif
 
 #####################################################################
@@ -761,19 +761,19 @@ endif
 
 fpc_showinstall: $(SHOWINSTALLTARGET)
 ifdef INSTALLEXEFILES
-	@$(ECHO) $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
+	@$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
 endif
 ifdef INSTALLPPUFILES
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
 ifneq ($(INSTALLPPULINKFILES),)
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
 endif
 ifneq ($(INSTALLPPULIBFILES),)
-	@$(ECHO) $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
+	@$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
 endif
 endif
 ifdef EXTRAINSTALLFILES
-	@$(ECHO) $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
+	@$(ECHO) -e $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
 endif
 
 fpc_install: $(INSTALLTARGET)
@@ -842,8 +842,8 @@ endif
 # Note: This will not remove the zipfile first
 fpc_zipinstalladd:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
 ifdef inlinux
@@ -859,8 +859,8 @@ endif
 # First remove the zip and then install
 fpc_zipinstall:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)

+ 12 - 12
utils/tply/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-22 01:44
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
 #
 
 defaultrule: all
@@ -757,12 +757,12 @@ fpc_smart:
 fpc_shared: all
 ifdef inlinux
 ifndef LIBNAME
-	@$(ECHO) LIBNAME not set
+	@$(ECHO) "LIBNAME not set"
 else
 	$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)
 endif
 else
-	@$(ECHO) Shared Libraries not supported
+	@$(ECHO) "Shared Libraries not supported"
 endif
 
 #####################################################################
@@ -790,19 +790,19 @@ endif
 
 fpc_showinstall: $(SHOWINSTALLTARGET)
 ifdef INSTALLEXEFILES
-	@$(ECHO) $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
+	@$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))
 endif
 ifdef INSTALLPPUFILES
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES))
 ifneq ($(INSTALLPPULINKFILES),)
-	@$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
+	@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
 endif
 ifneq ($(INSTALLPPULIBFILES),)
-	@$(ECHO) $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
+	@$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
 endif
 endif
 ifdef EXTRAINSTALLFILES
-	@$(ECHO) $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
+	@$(ECHO) -e $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFILES))
 endif
 
 fpc_install: $(INSTALLTARGET)
@@ -871,8 +871,8 @@ endif
 # Note: This will not remove the zipfile first
 fpc_zipinstalladd:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
 ifdef inlinux
@@ -888,8 +888,8 @@ endif
 # First remove the zip and then install
 fpc_zipinstall:
 ifndef ZIPNAME
-	@$(ECHO) Please specify ZIPNAME!
-	@exit
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
 else
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)