浏览代码

* regenerated

peter 25 年之前
父节点
当前提交
2eb25f4422
共有 58 个文件被更改,包括 365 次插入83 次删除
  1. 3 5
      api/Makefile
  2. 1 1
      api/go32v2/Makefile
  3. 1 1
      api/linux/Makefile
  4. 1 1
      api/win32/Makefile
  5. 3 1
      compiler/Makefile
  6. 1 1
      compiler/new/Makefile
  7. 3 5
      fcl/Makefile
  8. 1 1
      fcl/db/Makefile
  9. 1 1
      fcl/go32v2/Makefile
  10. 1 1
      fcl/linux/Makefile
  11. 1 1
      fcl/os2/Makefile
  12. 1 1
      fcl/shedit/gtk/Makefile
  13. 1 1
      fcl/tests/Makefile
  14. 1 1
      fcl/win32/Makefile
  15. 292 6
      ide/Makefile
  16. 1 1
      ide/fake/Makefile
  17. 1 1
      ide/fake/compiler/Makefile
  18. 1 1
      ide/fake/gdb/Makefile
  19. 1 1
      ide/text/Makefile
  20. 1 1
      install/demo/Makefile
  21. 1 1
      install/fpinst/Makefile
  22. 1 1
      packages/Makefile
  23. 1 1
      packages/forms/Makefile
  24. 1 1
      packages/forms/demo/Makefile
  25. 1 1
      packages/gdbint/Makefile
  26. 1 1
      packages/gdbint/libgdb/Makefile
  27. 1 1
      packages/ggi/Makefile
  28. 1 1
      packages/gtk/Makefile
  29. 1 1
      packages/gtk/examples/Makefile
  30. 1 1
      packages/gtk/tutorial/Makefile
  31. 1 1
      packages/ibase/Makefile
  32. 1 1
      packages/inet/Makefile
  33. 1 1
      packages/mysql/Makefile
  34. 1 1
      packages/ncurses/Makefile
  35. 1 1
      packages/opengl/Makefile
  36. 1 1
      packages/opengl/build/Makefile
  37. 1 1
      packages/opengl/examples/Makefile
  38. 1 1
      packages/opengl/linux/Makefile
  39. 1 1
      packages/paszlib/Makefile
  40. 1 1
      packages/postgres/Makefile
  41. 1 1
      packages/svgalib/Makefile
  42. 1 1
      packages/syslog/Makefile
  43. 1 1
      packages/uncgi/Makefile
  44. 1 1
      packages/utmp/Makefile
  45. 1 1
      packages/x11/Makefile
  46. 1 1
      packages/zlib/Makefile
  47. 3 5
      rtl/Makefile
  48. 1 1
      rtl/go32v1/Makefile
  49. 1 1
      rtl/go32v2/Makefile
  50. 2 2
      rtl/linux/Makefile
  51. 1 1
      rtl/os2/Makefile
  52. 1 1
      rtl/win32/Makefile
  53. 7 7
      tests/Makefile
  54. 2 2
      utils/Makefile
  55. 1 1
      utils/fprcp/Makefile
  56. 1 1
      utils/h2pas/Makefile
  57. 1 1
      utils/simulator/Makefile
  58. 1 1
      utils/tply/Makefile

+ 3 - 5
api/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all
@@ -448,7 +448,7 @@ install: $(addsuffix _install,$(OS_TARGET))
 
 sourceinstall: fpc_sourceinstall
 
-zipinstall: fpc_zipinstall $(addsuffix _zipinstall,$(OS_TARGET))
+zipinstall: fpc_zipinstall
 
 zipsourceinstall: fpc_zipsourceinstall
 
@@ -460,9 +460,7 @@ cleanall: $(addsuffix _cleanall,$(OS_TARGET))
 
 require: $(addsuffix _require,$(OS_TARGET))
 
-info: $(addsuffix _info,$(OS_TARGET))
-
-.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall require info
+.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall require
 
 #####################################################################
 # SourceInstall rules

+ 1 - 1
api/go32v2/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 1 - 1
api/linux/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 1 - 1
api/win32/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 3 - 1
compiler/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all
@@ -1286,6 +1286,8 @@ endif
 
 clean : execlean fpc_cleanall
 
+ppuclean: fpc_cleanall
+
 execlean :
 	-$(DEL) $(EXENAME)
 

+ 1 - 1
compiler/new/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 3 - 5
fcl/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all
@@ -448,7 +448,7 @@ install: $(addsuffix _install,$(OS_TARGET))
 
 sourceinstall: fpc_sourceinstall
 
-zipinstall: fpc_zipinstall $(addsuffix _zipinstall,$(OS_TARGET))
+zipinstall: fpc_zipinstall
 
 zipsourceinstall: fpc_zipsourceinstall
 
@@ -460,9 +460,7 @@ cleanall: $(addsuffix _cleanall,$(OS_TARGET))
 
 require: $(addsuffix _require,$(OS_TARGET))
 
-info: $(addsuffix _info,$(OS_TARGET))
-
-.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall require info
+.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall require
 
 #####################################################################
 # SourceInstall rules

+ 1 - 1
fcl/db/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 1 - 1
fcl/go32v2/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 1 - 1
fcl/linux/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 1 - 1
fcl/os2/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 1 - 1
fcl/shedit/gtk/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 1 - 1
fcl/tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 1 - 1
fcl/win32/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 292 - 6
ide/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all
@@ -166,6 +166,7 @@ override DIROBJECTS+=$(wildcard fake text)
 
 # Install
 
+PACKAGENAME=ide
 ZIPTARGET=install
 
 # Defaults
@@ -180,6 +181,147 @@ ZIPTARGET=install
 # Libraries
 
 
+#####################################################################
+# Shell tools
+#####################################################################
+
+# echo
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=echo
+ECHOE:=echo
+else
+ECHO:=$(firstword $(ECHO))
+ECHOE=$(ECHO) -E
+endif
+else
+ECHO:=$(firstword $(ECHO))
+ECHOE=$(ECHO) -E
+endif
+endif
+
+# To copy pograms
+ifndef COPY
+COPY:=cp -fp
+endif
+
+# Copy a whole tree
+ifndef COPYTREE
+COPYTREE:=cp -rfp
+endif
+
+# To move pograms
+ifndef MOVE
+MOVE:=mv -f
+endif
+
+# Check delete program
+ifndef DEL
+DEL:=rm -f
+endif
+
+# Check deltree program
+ifndef DELTREE
+DELTREE:=rm -rf
+endif
+
+# To install files
+ifndef INSTALL
+ifdef inlinux
+INSTALL:=install -m 644
+else
+INSTALL:=$(COPY)
+endif
+endif
+
+# To install programs
+ifndef INSTALLEXE
+ifdef inlinux
+INSTALLEXE:=install -m 755
+else
+INSTALLEXE:=$(COPY)
+endif
+endif
+
+# To make a directory.
+ifndef MKDIR
+ifdef inlinux
+MKDIR:=install -m 755 -d
+else
+MKDIR:=ginstall -m 755 -d
+endif
+endif
+
+export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+
+#####################################################################
+# Default Tools
+#####################################################################
+
+# assembler, redefine it if cross compiling
+ifndef AS
+AS=as
+endif
+
+# linker, but probably not used
+ifndef LD
+LD=ld
+endif
+
+# ppas.bat / ppas.sh
+ifdef inlinux
+PPAS=ppas.sh
+else
+ifdef inOS2
+PPAS=ppas.cmd
+else
+PPAS=ppas.bat
+endif
+endif
+
+# ldconfig to rebuild .so cache
+ifdef inlinux
+LDCONFIG=ldconfig
+else
+LDCONFIG=
+endif
+
+# ZipProg, you can't use Zip as the var name (PFV)
+ifndef ZIPPROG
+ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
+ifeq ($(ZIPPROG),)
+ZIPPROG=
+else
+ZIPPROG:=$(firstword $(ZIPPROG))
+endif
+endif
+export ZIPPROG
+
+ZIPOPT=-9
+ZIPEXT=.zip
+
+# Tar
+ifndef TARPROG
+TARPROG:=$(strip $(wildcard $(addsuffix /tar$(EXEEXT),$(SEARCHPATH))))
+ifeq ($(TARPROG),)
+TARPROG=
+else
+TARPROG:=$(firstword $(TARPROG))
+endif
+endif
+export TARPROG
+
+ifeq ($(USETAR),bz2)
+TAROPT=vI
+TAREXT=.tar.bz2
+else
+TAROPT=vz
+TAREXT=.tar.gz
+endif
+
 
 
 #####################################################################
@@ -202,6 +344,71 @@ DESTZIPDIR:=$(BASEDIR)
 endif
 export DESTZIPDIR
 
+#####################################################################
+# Install Directories
+#####################################################################
+
+# set the base directory where to install everything
+ifndef BASEINSTALLDIR
+ifdef inlinux
+BASEINSTALLDIR=$(PREFIXINSTALLDIR)/lib/fpc/$(FPC_VERSION)
+else
+BASEINSTALLDIR=$(PREFIXINSTALLDIR)
+endif
+endif
+
+# set the directory where to install the binaries
+ifndef BININSTALLDIR
+ifdef inlinux
+BININSTALLDIR=$(PREFIXINSTALLDIR)/bin
+else
+BININSTALLDIR=$(BASEINSTALLDIR)/bin/$(OS_TARGET)
+endif
+endif
+
+# set the directory where to install the units.
+ifndef UNITINSTALLDIR
+UNITINSTALLDIR=$(BASEINSTALLDIR)/units/$(OS_TARGET)
+ifdef UNITSUBDIR
+UNITINSTALLDIR:=$(UNITINSTALLDIR)/$(UNITSUBDIR)
+endif
+endif
+
+# Where to install shared libraries
+ifndef LIBINSTALLDIR
+ifdef inlinux
+LIBINSTALLDIR=$(PREFIXINSTALLDIR)/lib
+else
+LIBINSTALLDIR=$(UNITINSTALLDIR)
+endif
+endif
+
+# Where the source files will be stored
+ifndef SOURCEINSTALLDIR
+ifdef inlinux
+SOURCEINSTALLDIR=$(PREFIXINSTALLDIR)/src/fpc-$(FPC_VERSION)
+else
+SOURCEINSTALLDIR=$(BASEINSTALLDIR)/source
+endif
+ifdef SOURCESUBDIR
+SOURCEINSTALLDIR:=$(SOURCEINSTALLDIR)/$(SOURCESUBDIR)
+endif
+endif
+
+# Where the doc files will be stored
+ifndef DOCINSTALLDIR
+ifdef inlinux
+DOCINSTALLDIR=$(PREFIXINSTALLDIR)/doc/fpc-$(FPC_VERSION)
+else
+DOCINSTALLDIR=$(BASEINSTALLDIR)/doc
+endif
+endif
+
+# Where the some extra (data)files will be stored
+ifndef DATAINSTALLDIR
+DATAINSTALLDIR=$(BASEINSTALLDIR)
+endif
+
 #####################################################################
 # Redirection
 #####################################################################
@@ -233,11 +440,15 @@ smart: $(addsuffix _smart,$(DIROBJECTS))
 
 shared: $(addsuffix _shared,$(DIROBJECTS))
 
-showinstall: $(addsuffix _showinstall,$(DIROBJECTS))
+showinstall: $(addsuffix _showinstall,text)
+
+install: $(addsuffix _install,text)
 
-install: $(addsuffix _install,$(DIROBJECTS))
+sourceinstall: fpc_sourceinstall
 
-sourceinstall: $(addsuffix _sourceinstall,$(DIROBJECTS))
+zipinstall: fpc_zipinstall
+
+zipsourceinstall: fpc_zipsourceinstall
 
 clean: $(addsuffix _clean,$(DIROBJECTS))
 
@@ -247,7 +458,82 @@ cleanall: $(addsuffix _cleanall,$(DIROBJECTS))
 
 require: $(addsuffix _require,$(DIROBJECTS))
 
-.PHONY:  debug examples test smart shared showinstall install sourceinstall clean distclean cleanall require
+.PHONY:  debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall require
+
+#####################################################################
+# SourceInstall rules
+#####################################################################
+
+.PHONY: fpc_sourceinstall
+
+ifndef SOURCETOPDIR
+SOURCETOPDIR=$(BASEDIR)
+endif
+
+fpc_sourceinstall: clean
+	$(MKDIR) $(SOURCEINSTALLDIR)
+	$(COPYTREE) $(SOURCETOPDIR) $(SOURCEINSTALLDIR)
+
+#####################################################################
+# Zip
+#####################################################################
+
+.PHONY: fpc_zipinstall
+
+# Create suffix to add
+ifndef PACKAGESUFFIX
+PACKAGESUFFIX=$(OS_TARGET)
+ifeq ($(OS_TARGET),go32v2)
+PACKAGESUFFIX=go32
+endif
+ifeq ($(OS_TARGET),win32)
+PACKAGESUFFIX=w32
+endif
+endif
+
+# Temporary path to pack a file
+ifndef PACKDIR
+ifndef inlinux
+PACKDIR=$(BASEDIR)/pack_tmp
+else
+PACKDIR=/tmp/fpc-pack
+endif
+endif
+
+# Maybe create default zipname from packagename
+ifndef ZIPNAME
+ifdef PACKAGENAME
+ZIPNAME=$(PACKAGEPREFIX)$(PACKAGENAME)$(PACKAGESUFFIX)
+endif
+endif
+
+# Use tar by default under linux
+ifndef USEZIP
+ifdef inlinux
+USETAR=1
+endif
+endif
+
+fpc_zipinstall:
+ifndef ZIPNAME
+	@$(ECHO) "Please specify ZIPNAME!"
+	@exit 1
+else
+	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
+ifdef USETAR
+	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT)
+	cd $(PACKDIR) ; $(TARPROG) c$(TAROPT) --file $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT) * ; cd $(BASEDIR)
+else
+	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT)
+	cd $(PACKDIR) ; $(ZIPPROG) -Dr $(ZIPOPT) $(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT) * ; cd $(BASEDIR)
+endif
+	$(DELTREE) $(PACKDIR)
+endif
+
+.PHONY:  fpc_zipsourceinstall
+
+fpc_zipsourceinstall:
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall PACKAGESUFFIX=src
 
 #####################################################################
 # Directories
@@ -394,4 +680,4 @@ fullgdb:
 # Misc
 #
 clean_compiler:
-	make -C ../../compiler clean
+	$(MAKE) -C ../compiler clean

+ 1 - 1
ide/fake/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 1 - 1
ide/fake/compiler/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 1 - 1
ide/fake/gdb/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 1 - 1
ide/text/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 1 - 1
install/demo/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: both

+ 1 - 1
install/fpinst/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 1 - 1
packages/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/07]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 1 - 1
packages/forms/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 1 - 1
packages/forms/demo/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 1 - 1
packages/gdbint/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 1 - 1
packages/gdbint/libgdb/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 1 - 1
packages/ggi/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 1 - 1
packages/gtk/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 1 - 1
packages/gtk/examples/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 1 - 1
packages/gtk/tutorial/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 1 - 1
packages/ibase/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 1 - 1
packages/inet/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 1 - 1
packages/mysql/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 1 - 1
packages/ncurses/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/30]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 1 - 1
packages/opengl/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 1 - 1
packages/opengl/build/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 1 - 1
packages/opengl/examples/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 1 - 1
packages/opengl/linux/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 1 - 1
packages/paszlib/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 1 - 1
packages/postgres/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 1 - 1
packages/svgalib/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 1 - 1
packages/syslog/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/01]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 1 - 1
packages/uncgi/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 1 - 1
packages/utmp/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 1 - 1
packages/x11/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 1 - 1
packages/zlib/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 3 - 5
rtl/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all
@@ -448,7 +448,7 @@ install: $(addsuffix _install,$(OS_TARGET))
 
 sourceinstall: fpc_sourceinstall
 
-zipinstall: fpc_zipinstall $(addsuffix _zipinstall,$(OS_TARGET))
+zipinstall: fpc_zipinstall
 
 zipsourceinstall: fpc_zipsourceinstall
 
@@ -460,9 +460,7 @@ cleanall: $(addsuffix _cleanall,$(OS_TARGET))
 
 require: $(addsuffix _require,$(OS_TARGET))
 
-info: $(addsuffix _info,$(OS_TARGET))
-
-.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall require info
+.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall require
 
 #####################################################################
 # SourceInstall rules

+ 1 - 1
rtl/go32v1/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 1 - 1
rtl/go32v2/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/30]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 2 - 2
rtl/linux/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/30]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all
@@ -228,7 +228,7 @@ endif
 # Libraries
 
 LIBNAME=fprtl
-SHAREDLIBOBJECTUNITS=$(SYSTEMUNIT) objpas strings linux ports dos crt objects printer sysutils typinfo math cpu mmx getopts heaptrc errors sockets ipc
+SHAREDLIBUNITOBJECTS=$(SYSTEMUNIT) objpas strings linux ports dos crt objects printer sysutils typinfo math cpu mmx getopts heaptrc errors sockets ipc
 
 # Info
 

+ 1 - 1
rtl/os2/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 1 - 1
rtl/win32/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/30]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 7 - 7
tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: info
@@ -77,13 +77,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -136,14 +137,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -286,7 +287,6 @@ export DESTZIPDIR
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif

+ 2 - 2
utils/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all
@@ -193,7 +193,7 @@ override EXTRACLEANUNITS+=ppu ptopu
 
 # Install
 
-PACKAGENAME=utils
+PACKAGENAME=util
 ZIPTARGET=install
 
 # Defaults

+ 1 - 1
utils/fprcp/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 1 - 1
utils/h2pas/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 1 - 1
utils/simulator/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all

+ 1 - 1
utils/tply/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/28]
+# Makefile generated by fpcmake v0.99.13 [2000/02/08]
 #
 
 defaultrule: all