* updates for rpm/deb packaging

base/Makefile

@@ -637,6 +637,11 @@ SOURCEINSTALLDIR:=$(SOURCEINSTALLDIR)/$(SOURCESUBDIR)
 endif
 endif
 
+# Where the example files will be stored
+ifndef EXAMPLEINSTALLDIR
+EXAMPLEINSTALLDIR=$(SOURCEINSTALLDIR)
+endif
+
 # Where the doc files will be stored
 ifndef DOCINSTALLDIR
 ifdef inlinux
@@ -686,13 +691,15 @@ showinstall: $(addsuffix _showinstall,$(DIROBJECTS))
 
 sourceinstall: $(addsuffix _sourceinstall,$(DIROBJECTS))
 
+exampleinstall: $(addsuffix _exampleinstall,$(DIROBJECTS))
+
 zipsourceinstall: fpc_zipsourceinstall
 
 cleanall: fpc_cleanall $(addsuffix _cleanall,$(DIROBJECTS))
 
 require: $(addsuffix _require,$(DIROBJECTS))
 
-.PHONY:  debug examples test smart shared showinstall sourceinstall zipsourceinstall cleanall require
+.PHONY:  debug examples test smart shared showinstall sourceinstall exampleinstall zipsourceinstall cleanall require
 
 #####################################################################
 # Zip
@@ -812,7 +819,7 @@ OBJECTDIRIDE=1
 # Dir compiler
 
 ifdef OBJECTDIRCOMPILER
-.PHONY:  compiler_all compiler_debug compiler_examples compiler_test compiler_smart compiler_shared compiler_showinstall compiler_install compiler_sourceinstall compiler_zipinstall compiler_zipsourceinstall compiler_clean compiler_distclean compiler_cleanall compiler_require compiler_info
+.PHONY:  compiler_all compiler_debug compiler_examples compiler_test compiler_smart compiler_shared compiler_showinstall compiler_install compiler_sourceinstall compiler_exampleinstall compiler_zipinstall compiler_zipsourceinstall compiler_clean compiler_distclean compiler_cleanall compiler_require compiler_info
 
 compiler_all:
 	$(MAKE) -C compiler all
@@ -841,6 +848,9 @@ compiler_install:
 compiler_sourceinstall:
 	$(MAKE) -C compiler sourceinstall
 
+compiler_exampleinstall:
+	$(MAKE) -C compiler exampleinstall
+
 compiler_zipinstall:
 	$(MAKE) -C compiler zipinstall
 
@@ -866,7 +876,7 @@ endif
 # Dir rtl
 
 ifdef OBJECTDIRRTL
-.PHONY:  rtl_all rtl_debug rtl_examples rtl_test rtl_smart rtl_shared rtl_showinstall rtl_install rtl_sourceinstall rtl_zipinstall rtl_zipsourceinstall rtl_clean rtl_distclean rtl_cleanall rtl_require rtl_info
+.PHONY:  rtl_all rtl_debug rtl_examples rtl_test rtl_smart rtl_shared rtl_showinstall rtl_install rtl_sourceinstall rtl_exampleinstall rtl_zipinstall rtl_zipsourceinstall rtl_clean rtl_distclean rtl_cleanall rtl_require rtl_info
 
 rtl_all:
 	$(MAKE) -C rtl all
@@ -895,6 +905,9 @@ rtl_install:
 rtl_sourceinstall:
 	$(MAKE) -C rtl sourceinstall
 
+rtl_exampleinstall:
+	$(MAKE) -C rtl exampleinstall
+
 rtl_zipinstall:
 	$(MAKE) -C rtl zipinstall
 
@@ -920,7 +933,7 @@ endif
 # Dir utils
 
 ifdef OBJECTDIRUTILS
-.PHONY:  utils_all utils_debug utils_examples utils_test utils_smart utils_shared utils_showinstall utils_install utils_sourceinstall utils_zipinstall utils_zipsourceinstall utils_clean utils_distclean utils_cleanall utils_require utils_info
+.PHONY:  utils_all utils_debug utils_examples utils_test utils_smart utils_shared utils_showinstall utils_install utils_sourceinstall utils_exampleinstall utils_zipinstall utils_zipsourceinstall utils_clean utils_distclean utils_cleanall utils_require utils_info
 
 utils_all:
 	$(MAKE) -C utils all
@@ -949,6 +962,9 @@ utils_install:
 utils_sourceinstall:
 	$(MAKE) -C utils sourceinstall
 
+utils_exampleinstall:
+	$(MAKE) -C utils exampleinstall
+
 utils_zipinstall:
 	$(MAKE) -C utils zipinstall
 
@@ -974,7 +990,7 @@ endif
 # Dir fcl
 
 ifdef OBJECTDIRFCL
-.PHONY:  fcl_all fcl_debug fcl_examples fcl_test fcl_smart fcl_shared fcl_showinstall fcl_install fcl_sourceinstall fcl_zipinstall fcl_zipsourceinstall fcl_clean fcl_distclean fcl_cleanall fcl_require fcl_info
+.PHONY:  fcl_all fcl_debug fcl_examples fcl_test fcl_smart fcl_shared fcl_showinstall fcl_install fcl_sourceinstall fcl_exampleinstall fcl_zipinstall fcl_zipsourceinstall fcl_clean fcl_distclean fcl_cleanall fcl_require fcl_info
 
 fcl_all:
 	$(MAKE) -C fcl all
@@ -1003,6 +1019,9 @@ fcl_install:
 fcl_sourceinstall:
 	$(MAKE) -C fcl sourceinstall
 
+fcl_exampleinstall:
+	$(MAKE) -C fcl exampleinstall
+
 fcl_zipinstall:
 	$(MAKE) -C fcl zipinstall
 
@@ -1028,7 +1047,7 @@ endif
 # Dir api
 
 ifdef OBJECTDIRAPI
-.PHONY:  api_all api_debug api_examples api_test api_smart api_shared api_showinstall api_install api_sourceinstall api_zipinstall api_zipsourceinstall api_clean api_distclean api_cleanall api_require api_info
+.PHONY:  api_all api_debug api_examples api_test api_smart api_shared api_showinstall api_install api_sourceinstall api_exampleinstall api_zipinstall api_zipsourceinstall api_clean api_distclean api_cleanall api_require api_info
 
 api_all:
 	$(MAKE) -C api all
@@ -1057,6 +1076,9 @@ api_install:
 api_sourceinstall:
 	$(MAKE) -C api sourceinstall
 
+api_exampleinstall:
+	$(MAKE) -C api exampleinstall
+
 api_zipinstall:
 	$(MAKE) -C api zipinstall
 
@@ -1082,7 +1104,7 @@ endif
 # Dir fv
 
 ifdef OBJECTDIRFV
-.PHONY:  fv_all fv_debug fv_examples fv_test fv_smart fv_shared fv_showinstall fv_install fv_sourceinstall fv_zipinstall fv_zipsourceinstall fv_clean fv_distclean fv_cleanall fv_require fv_info
+.PHONY:  fv_all fv_debug fv_examples fv_test fv_smart fv_shared fv_showinstall fv_install fv_sourceinstall fv_exampleinstall fv_zipinstall fv_zipsourceinstall fv_clean fv_distclean fv_cleanall fv_require fv_info
 
 fv_all:
 	$(MAKE) -C fv all
@@ -1111,6 +1133,9 @@ fv_install:
 fv_sourceinstall:
 	$(MAKE) -C fv sourceinstall
 
+fv_exampleinstall:
+	$(MAKE) -C fv exampleinstall
+
 fv_zipinstall:
 	$(MAKE) -C fv zipinstall
 
@@ -1136,7 +1161,7 @@ endif
 # Dir packages
 
 ifdef OBJECTDIRPACKAGES
-.PHONY:  packages_all packages_debug packages_examples packages_test packages_smart packages_shared packages_showinstall packages_install packages_sourceinstall packages_zipinstall packages_zipsourceinstall packages_clean packages_distclean packages_cleanall packages_require packages_info
+.PHONY:  packages_all packages_debug packages_examples packages_test packages_smart packages_shared packages_showinstall packages_install packages_sourceinstall packages_exampleinstall packages_zipinstall packages_zipsourceinstall packages_clean packages_distclean packages_cleanall packages_require packages_info
 
 packages_all:
 	$(MAKE) -C packages all
@@ -1165,6 +1190,9 @@ packages_install:
 packages_sourceinstall:
 	$(MAKE) -C packages sourceinstall
 
+packages_exampleinstall:
+	$(MAKE) -C packages exampleinstall
+
 packages_zipinstall:
 	$(MAKE) -C packages zipinstall
 
@@ -1190,7 +1218,7 @@ endif
 # Dir ide
 
 ifdef OBJECTDIRIDE
-.PHONY:  ide_all ide_debug ide_examples ide_test ide_smart ide_shared ide_showinstall ide_install ide_sourceinstall ide_zipinstall ide_zipsourceinstall ide_clean ide_distclean ide_cleanall ide_require ide_info
+.PHONY:  ide_all ide_debug ide_examples ide_test ide_smart ide_shared ide_showinstall ide_install ide_sourceinstall ide_exampleinstall ide_zipinstall ide_zipsourceinstall ide_clean ide_distclean ide_cleanall ide_require ide_info
 
 ide_all:
 	$(MAKE) -C ide all
@@ -1219,6 +1247,9 @@ ide_install:
 ide_sourceinstall:
 	$(MAKE) -C ide sourceinstall
 
+ide_exampleinstall:
+	$(MAKE) -C ide exampleinstall
+
 ide_zipinstall:
 	$(MAKE) -C ide zipinstall
 

install/debian/changelog

@@ -1,4 +1,4 @@
-fpc (0.99.14-0) unstable; urgency=low
+fpc (0.99.15-0) unstable; urgency=low
 
   * New Upstream
 

install/debian/fp-units-base.files.in

@@ -1,6 +1,22 @@
 
+/usr/lib/fpc/%{fpcversion}/units/linux/zlib.ppu
+
+/usr/lib/fpc/%{fpcversion}/units/linux/zlib.o
+
 /usr/lib/fpc/%{fpcversion}/units/linux/ncurses.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/ncrt.ppu
+/usr/lib/fpc/%{fpcversion}/units/linux/panel.ppu 
+/usr/lib/fpc/%{fpcversion}/units/linux/ncrt.ppu 
+/usr/lib/fpc/%{fpcversion}/units/linux/ocrt.ppu
+
+/usr/lib/fpc/%{fpcversion}/units/linux/ocrt.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/ncrt.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/ncurses.o
+
+/usr/lib/fpc/%{fpcversion}/units/linux/x.ppu 
+/usr/lib/fpc/%{fpcversion}/units/linux/xlib.ppu 
+/usr/lib/fpc/%{fpcversion}/units/linux/xutil.ppu 
+/usr/lib/fpc/%{fpcversion}/units/linux/xresource.ppu
+
+/usr/lib/fpc/%{fpcversion}/units/linux/regexpr.ppu
 
-/usr/lib/fpc/%{fpcversion}/units/linux/ncurses.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/ncrt.o
+/usr/lib/fpc/%{fpcversion}/units/linux/regexpr.o

install/debian/fp-units-db.files.in

@@ -1,18 +1,19 @@
 
-/usr/lib/fpc/%{fpcversion}/units/linux/ibase.ppu
-
-/usr/lib/fpc/%{fpcversion}/units/linux/ibase.o
-
 /usr/lib/fpc/%{fpcversion}/units/linux/mysql_com.ppu 
 /usr/lib/fpc/%{fpcversion}/units/linux/mysql_version.ppu 
 /usr/lib/fpc/%{fpcversion}/units/linux/mysql.ppu
 
-/usr/lib/fpc/%{fpcversion}/units/linux/mysql_com.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/mysql.o 
 /usr/lib/fpc/%{fpcversion}/units/linux/mysql_version.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/mysql.o
+/usr/lib/fpc/%{fpcversion}/units/linux/mysql_com.o
+
+/usr/lib/fpc/%{fpcversion}/units/linux/ibase40.ppu 
+/usr/lib/fpc/%{fpcversion}/units/linux/ibase60.ppu
+
+/usr/lib/fpc/%{fpcversion}/units/linux/ibase40.o
 
 /usr/lib/fpc/%{fpcversion}/units/linux/dllist.ppu 
 /usr/lib/fpc/%{fpcversion}/units/linux/postgres.ppu
 
-/usr/lib/fpc/%{fpcversion}/units/linux/dllist.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/postgres.o
+/usr/lib/fpc/%{fpcversion}/units/linux/postgres.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/dllist.o

install/debian/fp-units-gfx.files.in

@@ -1,23 +1,23 @@
 
-/usr/lib/fpc/%{fpcversion}/units/linux/gii.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/ggi.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/ggi2d.ppu
-
-/usr/lib/fpc/%{fpcversion}/units/linux/ggi.o
-
 /usr/lib/fpc/%{fpcversion}/units/linux/gl.ppu 
 /usr/lib/fpc/%{fpcversion}/units/linux/glut.ppu
 
-/usr/lib/fpc/%{fpcversion}/units/linux/gl.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/glut.o
+/usr/lib/fpc/%{fpcversion}/units/linux/glut.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/gl.o
+
+/usr/bin/fd2pascal
+
+/usr/lib/fpc/%{fpcversion}/units/linux/forms.ppu
+
+/usr/lib/fpc/%{fpcversion}/units/linux/forms.o
 
 /usr/lib/fpc/%{fpcversion}/units/linux/svgalib.ppu 
 /usr/lib/fpc/%{fpcversion}/units/linux/vgamouse.ppu
 
 /usr/lib/fpc/%{fpcversion}/units/linux/svgalib.o
 
-/usr/bin/fd2pascal
-
-/usr/lib/fpc/%{fpcversion}/units/linux/forms.ppu
+/usr/lib/fpc/%{fpcversion}/units/linux/gii.ppu 
+/usr/lib/fpc/%{fpcversion}/units/linux/ggi.ppu 
+/usr/lib/fpc/%{fpcversion}/units/linux/ggi2d.ppu
 
-/usr/lib/fpc/%{fpcversion}/units/linux/forms.o
+/usr/lib/fpc/%{fpcversion}/units/linux/ggi.o

install/debian/fp-units-misc.files.in

@@ -3,6 +3,16 @@
 
 /usr/lib/fpc/%{fpcversion}/units/linux/utmp.o
 
+/usr/lib/fpc/%{fpcversion}/units/linux/systemlog.ppu
+
+/usr/lib/fpc/%{fpcversion}/units/linux/systemlog.o
+
+/usr/lib/fpc/%{fpcversion}/units/linux/gdbint.ppu 
+/usr/lib/fpc/%{fpcversion}/units/linux/gdbcon.ppu
+
+/usr/lib/fpc/%{fpcversion}/units/linux/gdbcon.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/gdbint.o
+
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/paszlib.ppu 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/adler.ppu 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/crc.ppu 
@@ -22,21 +32,27 @@
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zuncompr.ppu 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zutil.ppu
 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/paszlib.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/adler.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/crc.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/crcasm.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/gzio.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/infblock.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/infcodes.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/inffast.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/inftrees.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/infutil.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/strutils.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/trees.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zcompres.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zdeflate.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zinflate.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zbase.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zutil.o 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zuncompr.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zutil.o
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zbase.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zinflate.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zdeflate.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zcompres.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/trees.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/strutils.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/infutil.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/inftrees.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/inffast.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/infcodes.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/infblock.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/gzio.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/crcasm.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/crc.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/adler.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/paszlib.o
+
+/usr/lib/fpc/%{fpcversion}/units/linux/ziptypes.ppu 
+/usr/lib/fpc/%{fpcversion}/units/linux/unzip.ppu
+
+/usr/lib/fpc/%{fpcversion}/units/linux/unzip.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/ziptypes.o

install/demo/Makefile

@@ -203,10 +203,6 @@ endif
 # Libraries
 
 
-# Info
-
-INFOTARGET=fpc_infocfg fpc_infoobjects fpc_infoinstall 
-
 #####################################################################
 # Shell tools
 #####################################################################
@@ -714,7 +710,7 @@ showinstall: fpc_showinstall $(addsuffix _showinstall,$(DIROBJECTS))
 
 install: fpc_install $(addsuffix _install,$(DIROBJECTS))
 
-sourceinstall: fpc_sourceinstall $(addsuffix _sourceinstall,$(DIROBJECTS))
+sourceinstall: fpc_sourceinstall
 
 exampleinstall: fpc_exampleinstall $(addsuffix _exampleinstall,$(DIROBJECTS))
 
@@ -987,68 +983,6 @@ endif
 	-$(DELTREE) *$(SMARTEXT)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
-#####################################################################
-# Info rules
-#####################################################################
-
-.PHONY: fpc_info fpc_cfginfo fpc_objectinfo fpc_toolsinfo fpc_installinfo \
-	fpc_dirinfo
-
-fpc_info: $(INFOTARGET)
-
-fpc_infocfg:
-	@$(ECHO)
-	@$(ECHO)  == Configuration info ==
-	@$(ECHO)
-	@$(ECHO)  FPC....... $(FPC)
-	@$(ECHO)  Version... $(FPC_VERSION)
-	@$(ECHO)  CPU....... $(CPU_TARGET)
-	@$(ECHO)  Source.... $(OS_SOURCE)
-	@$(ECHO)  Target.... $(OS_TARGET)
-	@$(ECHO)
-
-fpc_infoobjects:
-	@$(ECHO)
-	@$(ECHO)  == Object info ==
-	@$(ECHO)
-	@$(ECHO)  LoaderObjects..... $(LOADEROBJECTS)
-	@$(ECHO)  UnitObjects....... $(UNITOBJECTS)
-	@$(ECHO)  ExeObjects........ $(EXEOBJECTS)
-	@$(ECHO)
-	@$(ECHO)  ExtraCleanUnits... $(EXTRACLEANUNITS)
-	@$(ECHO)  ExtraCleanFiles... $(EXTRACLEANFILES)
-	@$(ECHO)
-	@$(ECHO)  ExtraInstallUnits. $(EXTRAINSTALLUNITS)
-	@$(ECHO)  ExtraInstallFiles. $(EXTRAINSTALLFILES)
-	@$(ECHO)
-
-fpc_infoinstall:
-	@$(ECHO)
-	@$(ECHO)  == Install info ==
-	@$(ECHO)
-ifdef DATE
-	@$(ECHO)  DateStr.............. $(DATESTR)
-endif
-ifdef PACKAGEPREFIX
-	@$(ECHO)  PackagePrefix........ $(PACKAGEPREFIX)
-endif
-ifdef PACKAGENAME
-	@$(ECHO)  PackageName.......... $(PACKAGENAME)
-endif
-	@$(ECHO)  PackageSuffix........ $(PACKAGESUFFIX)
-	@$(ECHO)
-	@$(ECHO)  BaseInstallDir....... $(BASEINSTALLDIR)
-	@$(ECHO)  BinInstallDir........ $(BININSTALLDIR)
-	@$(ECHO)  LibInstallDir........ $(LIBINSTALLDIR)
-	@$(ECHO)  UnitInstallDir....... $(UNITINSTALLDIR)
-	@$(ECHO)  SourceInstallDir..... $(SOURCEINSTALLDIR)
-	@$(ECHO)  DocInstallDir........ $(DOCINSTALLDIR)
-	@$(ECHO)  DataInstallDir....... $(DATAINSTALLDIR)
-	@$(ECHO)
-	@$(ECHO)  DestZipDir........... $(DESTZIPDIR)
-	@$(ECHO)  ZipName.............. $(ZIPNAME)
-	@$(ECHO)
-
 #####################################################################
 # Directories
 #####################################################################
@@ -1362,6 +1296,8 @@ endif
 # Users rules
 #####################################################################
 
+.PHONY: info
+
 info:
 	@echo Makefile targets are
 	@echo - all
@@ -1369,3 +1305,18 @@ info:
 	@echo - graph
 	@echo - modex
 	@echo - win32
+	@echo
+	@echo - installexamples
+
+#################################
+# Demo installation for linux
+#
+
+.PHONY: installexamples
+
+ifndef EXAMPLESINSTALLDIR
+EXAMPLESINSTALLDIR=$(DOCINSTALLDIR)/examples
+endif
+
+installexamples:
+	$(MAKE) sourceinstall SOURCEINSTALLDIR=$(EXAMPLESINSTALLDIR)

install/demo/Makefile.fpc

@@ -10,7 +10,7 @@ dirs_linux=linux
 
 [install]
 packagename=demo
-sourcesubdir=0
+sourcesubdirs=0
 
 [defaults]
 defaultrule=all
@@ -19,7 +19,12 @@ defaultrule=all
 fpcdir=..
 targetdir=.
 
+[sections]
+info=0
+
 [rules]
+.PHONY: info
+
 info:
         @echo Makefile targets are
         @echo - all
@@ -27,3 +32,18 @@ info:
         @echo - graph
         @echo - modex
         @echo - win32
+        @echo
+        @echo - installexamples
+
+#################################
+# Demo installation for linux
+#
+
+.PHONY: installexamples
+
+ifndef EXAMPLESINSTALLDIR
+EXAMPLESINSTALLDIR=$(DOCINSTALLDIR)/examples
+endif
+
+installexamples:
+        $(MAKE) sourceinstall SOURCEINSTALLDIR=$(EXAMPLESINSTALLDIR)

install/demo/fpcdemos.txt

@@ -7,6 +7,7 @@ This packages contains the following subdirs:
          includes gameunit (text&graph), outputs to another subdir level
 - modex  demos that make extensive use of modeX (runs with go32v2 only)
 - win32  demos that are win32 specific
+- linux  demos that are linux specific
 
 To build the programs simply type 'make' in the base dir.
 

install/demo/graph/Makefile

@@ -2,7 +2,7 @@
 # Makefile generated by fpcmake v0.99.15 [2000/04/08]
 #
 
-defaultrule: both
+defaultrule: all
 
 #####################################################################
 # Autodetect OS (Linux or Dos or Windows NT)
@@ -185,16 +185,7 @@ endif
 # Targets
 
 override UNITOBJECTS+=gameunit
-override EXEOBJECTS+=fpctris
-ifeq ($(OS_TARGET),linux)
-override EXEOBJECTS+=mandel samegame quad maze gravwars
-endif
-ifeq ($(OS_TARGET),go32v2)
-override EXEOBJECTS+=mandel samegame quad maze gravwars
-endif
-ifeq ($(OS_TARGET),win32)
-override EXEOBJECTS+=mandel samegame quad maze gravwars
-endif
+override EXEOBJECTS+=fpctris mandel samegame quad maze gravwars
 
 # Clean
 
@@ -651,6 +642,11 @@ SOURCEINSTALLDIR:=$(SOURCEINSTALLDIR)/$(SOURCESUBDIR)
 endif
 endif
 
+# Where the example files will be stored
+ifndef EXAMPLEINSTALLDIR
+EXAMPLEINSTALLDIR=$(SOURCEINSTALLDIR)
+endif
+
 # Where the doc files will be stored
 ifndef DOCINSTALLDIR
 ifdef inlinux
@@ -801,8 +797,6 @@ endif
 # Standard rules
 #####################################################################
 
-all: fpc_all
-
 debug: fpc_debug
 
 smart: fpc_smart
@@ -815,6 +809,8 @@ install: fpc_install
 
 sourceinstall: fpc_sourceinstall
 
+exampleinstall: fpc_exampleinstall
+
 zipinstall: fpc_zipinstall
 
 zipsourceinstall: fpc_zipsourceinstall
@@ -825,7 +821,7 @@ cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall distclean cleanall info
+.PHONY:  debug smart shared showinstall install sourceinstall exampleinstall zipinstall zipsourceinstall distclean cleanall info
 
 #####################################################################
 # Units
@@ -989,7 +985,7 @@ endif
 # SourceInstall rules
 #####################################################################
 
-.PHONY: fpc_sourceinstall
+.PHONY: fpc_sourceinstall fpc_exampleinstall
 
 ifndef SOURCETOPDIR
 SOURCETOPDIR=$(BASEDIR)
@@ -999,6 +995,10 @@ fpc_sourceinstall: clean
 	$(MKDIR) $(SOURCEINSTALLDIR)
 	$(COPYTREE) $(SOURCETOPDIR) $(SOURCEINSTALLDIR)
 
+fpc_exampleinstall: clean
+	$(MKDIR) $(EXAMPLEINSTALLDIR)
+	$(COPYTREE) $(EXAMPLESRC) $(EXAMPLEINSTALLDIR)
+
 #####################################################################
 # Zip
 #####################################################################
@@ -1055,11 +1055,14 @@ endif
 	$(DELTREE) $(PACKDIR)
 endif
 
-.PHONY:  fpc_zipsourceinstall
+.PHONY:  fpc_zipexampleinstall
 
 fpc_zipsourceinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall PACKAGESUFFIX=src
 
+fpc_zipexampleinstall:
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall PACKAGESUFFIX=exm
+
 #####################################################################
 # Clean rules
 #####################################################################
@@ -1180,45 +1183,26 @@ endif
 # Users rules
 #####################################################################
 
-ifeq ($(OS_TARGET),win32)
-vpath %$(PASEXT) win32
-endif
 .PHONY: text gfx both
 
+all: both
+
 clean : execlean fpc_cleanall
 
 execlean :
-	$(DEL) text/*
 	$(DELTREE) text
-	$(DEL) graph/*
 	$(DELTREE) graph
 
 # below projects will call ourselves recursive
 
 text:
 	$(MKDIR) text
-	$(MAKE) all TARGETDIR=text
+	$(MAKE) fpc_all TARGETDIR=text
 
 graph:
 	$(MKDIR) graph
-	$(MAKE) all TARGETDIR=graph GRAPHICS=1
+	$(MAKE) fpc_all TARGETDIR=graph GRAPHICS=1
 
 both:
 	$(MAKE) text
 	$(MAKE) graph
-
-#################################
-# Demo installation for linux
-#
-
-# possibly wont work
-
-.PHONY: installexamples
-
-ifndef EXAMPLESINSTALLDIR
-EXAMPLESINSTALLDIR=$(DOCINSTALLDIR)/examples
-endif
-
-installexamples:
-	$(MKDIR) $(EXAMPLESINSTALLDIR)
-	$(COPYTREE) * $(EXAMPLESINSTALLDIR)

install/demo/graph/Makefile.fpc

@@ -4,22 +4,14 @@
 
 [targets]
 units=gameunit
-programs=fpctris
-programs_win32=mandel samegame quad maze gravwars              
-programs_linux=mandel samegame quad maze gravwars
-programs_go32v2=mandel samegame quad maze gravwars
-# anyone who wants to port this sampels on OS/2 ???
+programs=fpctris mandel samegame quad maze gravwars
 
 [require]
-# Not always necessary, but saves a lot of trouble
 packages=api
 
 [install]
 packagename=demo
 
-[defaults]
-defaultrule=both
-
 [dirs]
 fpcdir=../..
 targetdir=.
@@ -30,46 +22,26 @@ override FPCOPT+=-dUSEGRAPHICS
 endif
 
 [rules]
-ifeq ($(OS_TARGET),win32)
-vpath %$(PASEXT) win32
-endif
 .PHONY: text gfx both
 
+all: both
+
 clean : execlean fpc_cleanall
 
 execlean :
-        $(DEL) text/*
         $(DELTREE) text
-        $(DEL) graph/*
         $(DELTREE) graph
 
 # below projects will call ourselves recursive
 
 text:
         $(MKDIR) text
-        $(MAKE) all TARGETDIR=text
+        $(MAKE) fpc_all TARGETDIR=text
 
 graph:
         $(MKDIR) graph
-        $(MAKE) all TARGETDIR=graph GRAPHICS=1
+        $(MAKE) fpc_all TARGETDIR=graph GRAPHICS=1
 
 both:
         $(MAKE) text
         $(MAKE) graph
-
-#################################
-# Demo installation for linux
-#
-
-# possibly wont work
-
-.PHONY: installexamples
-
-ifndef EXAMPLESINSTALLDIR
-EXAMPLESINSTALLDIR=$(DOCINSTALLDIR)/examples
-endif
-
-installexamples:
-        $(MKDIR) $(EXAMPLESINSTALLDIR)
-        $(COPYTREE) * $(EXAMPLESINSTALLDIR)
-

install/demo/linux/Makefile

@@ -184,8 +184,8 @@ endif
 
 # Targets
 
-ifeq ($(OS_TARGET),win32)
-override EXEOBJECTS+=winhello menu dlltest testdll edit
+ifeq ($(OS_TARGET),linux)
+override EXEOBJECTS+=daemon
 endif
 
 # Clean
@@ -206,7 +206,7 @@ endif
 
 # Packages
 
-override PACKAGES+=rtl api
+override PACKAGES+=rtl
 
 # Libraries
 
@@ -501,7 +501,6 @@ endif
 # PACKAGESDIR packages
 
 PACKAGERTL=1
-PACKAGEAPI=1
 
 ifdef PACKAGERTL
 ifneq ($(wildcard $(FPCDIR)/rtl),)
@@ -532,35 +531,6 @@ ifdef UNITDIR_RTL
 override NEEDUNITDIR+=$(UNITDIR_RTL)
 endif
 endif
-ifdef PACKAGEAPI
-ifneq ($(wildcard $(FPCDIR)/api),)
-ifneq ($(wildcard $(FPCDIR)/api/$(OS_TARGET)),)
-PACKAGEDIR_API=$(FPCDIR)/api/$(OS_TARGET)
-else
-PACKAGEDIR_API=$(FPCDIR)/api
-endif
-ifeq ($(wildcard $(PACKAGEDIR_API)/$(FPCMADE)),)
-override COMPILEPACKAGES+=package_api
-package_api:
-	$(MAKE) -C $(PACKAGEDIR_API) all
-endif
-UNITDIR_API=$(PACKAGEDIR_API)
-else
-PACKAGEDIR_API=
-ifneq ($(wildcard $(UNITSDIR)/api),)
-ifneq ($(wildcard $(UNITSDIR)/api/$(OS_TARGET)),)
-UNITDIR_API=$(UNITSDIR)/api/$(OS_TARGET)
-else
-UNITDIR_API=$(UNITSDIR)/api
-endif
-else
-UNITDIR_API=
-endif
-endif
-ifdef UNITDIR_API
-override NEEDUNITDIR+=$(UNITDIR_API)
-endif
-endif
 
 
 #####################################################################
@@ -634,6 +604,11 @@ SOURCEINSTALLDIR:=$(SOURCEINSTALLDIR)/$(SOURCESUBDIR)
 endif
 endif
 
+# Where the example files will be stored
+ifndef EXAMPLEINSTALLDIR
+EXAMPLEINSTALLDIR=$(SOURCEINSTALLDIR)
+endif
+
 # Where the doc files will be stored
 ifndef DOCINSTALLDIR
 ifdef inlinux
@@ -798,17 +773,21 @@ install: fpc_install
 
 sourceinstall: fpc_sourceinstall
 
+exampleinstall: fpc_exampleinstall
+
 zipinstall: fpc_zipinstall
 
 zipsourceinstall: fpc_zipsourceinstall
 
+clean: fpc_clean
+
 distclean: fpc_distclean
 
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall distclean cleanall info
+.PHONY:  all debug smart shared showinstall install sourceinstall exampleinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Exes
@@ -958,7 +937,7 @@ endif
 # SourceInstall rules
 #####################################################################
 
-.PHONY: fpc_sourceinstall
+.PHONY: fpc_sourceinstall fpc_exampleinstall
 
 ifndef SOURCETOPDIR
 SOURCETOPDIR=$(BASEDIR)
@@ -968,6 +947,10 @@ fpc_sourceinstall: clean
 	$(MKDIR) $(SOURCEINSTALLDIR)
 	$(COPYTREE) $(SOURCETOPDIR) $(SOURCEINSTALLDIR)
 
+fpc_exampleinstall: clean
+	$(MKDIR) $(EXAMPLEINSTALLDIR)
+	$(COPYTREE) $(EXAMPLESRC) $(EXAMPLEINSTALLDIR)
+
 #####################################################################
 # Zip
 #####################################################################
@@ -1024,11 +1007,14 @@ endif
 	$(DELTREE) $(PACKDIR)
 endif
 
-.PHONY:  fpc_zipsourceinstall
+.PHONY:  fpc_zipexampleinstall
 
 fpc_zipsourceinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall PACKAGESUFFIX=src
 
+fpc_zipexampleinstall:
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall PACKAGESUFFIX=exm
+
 #####################################################################
 # Clean rules
 #####################################################################
@@ -1145,28 +1131,3 @@ ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
 
-#####################################################################
-# Users rules
-#####################################################################
-
-ifeq ($(OS_TARGET),win32)
-vpath %$(PASEXT) win32
-endif
-
-clean : execlean fpc_cleanall
-
-execlean :
-
-#################################
-# Demo installation for linux
-#
-
-.PHONY: installexamples
-
-ifndef EXAMPLESINSTALLDIR
-EXAMPLESINSTALLDIR=$(DOCINSTALLDIR)/examples
-endif
-
-installexamples:
-	$(MKDIR) $(EXAMPLESINSTALLDIR)
-	$(COPYTREE) * $(EXAMPLESINSTALLDIR)

install/demo/linux/Makefile.fpc

@@ -3,22 +3,8 @@
 #
 
 [targets]
-programs_linux=deamon
-
-[install]
-
-[defaults]
-defaultrule=all
+programs_linux=daemon
 
 [dirs]
 fpcdir=../..
 targetdir=.
-
-[postsettings]
-
-[rules]
-clean : execlean fpc_cleanall
-
-execlean :
-
-

install/demo/modex/Makefile

@@ -206,7 +206,7 @@ endif
 
 # Packages
 
-override PACKAGES+=rtl api
+override PACKAGES+=rtl
 
 # Libraries
 
@@ -501,7 +501,6 @@ endif
 # PACKAGESDIR packages
 
 PACKAGERTL=1
-PACKAGEAPI=1
 
 ifdef PACKAGERTL
 ifneq ($(wildcard $(FPCDIR)/rtl),)
@@ -532,35 +531,6 @@ ifdef UNITDIR_RTL
 override NEEDUNITDIR+=$(UNITDIR_RTL)
 endif
 endif
-ifdef PACKAGEAPI
-ifneq ($(wildcard $(FPCDIR)/api),)
-ifneq ($(wildcard $(FPCDIR)/api/$(OS_TARGET)),)
-PACKAGEDIR_API=$(FPCDIR)/api/$(OS_TARGET)
-else
-PACKAGEDIR_API=$(FPCDIR)/api
-endif
-ifeq ($(wildcard $(PACKAGEDIR_API)/$(FPCMADE)),)
-override COMPILEPACKAGES+=package_api
-package_api:
-	$(MAKE) -C $(PACKAGEDIR_API) all
-endif
-UNITDIR_API=$(PACKAGEDIR_API)
-else
-PACKAGEDIR_API=
-ifneq ($(wildcard $(UNITSDIR)/api),)
-ifneq ($(wildcard $(UNITSDIR)/api/$(OS_TARGET)),)
-UNITDIR_API=$(UNITSDIR)/api/$(OS_TARGET)
-else
-UNITDIR_API=$(UNITSDIR)/api
-endif
-else
-UNITDIR_API=
-endif
-endif
-ifdef UNITDIR_API
-override NEEDUNITDIR+=$(UNITDIR_API)
-endif
-endif
 
 
 #####################################################################
@@ -634,6 +604,11 @@ SOURCEINSTALLDIR:=$(SOURCEINSTALLDIR)/$(SOURCESUBDIR)
 endif
 endif
 
+# Where the example files will be stored
+ifndef EXAMPLEINSTALLDIR
+EXAMPLEINSTALLDIR=$(SOURCEINSTALLDIR)
+endif
+
 # Where the doc files will be stored
 ifndef DOCINSTALLDIR
 ifdef inlinux
@@ -798,17 +773,21 @@ install: fpc_install
 
 sourceinstall: fpc_sourceinstall
 
+exampleinstall: fpc_exampleinstall
+
 zipinstall: fpc_zipinstall
 
 zipsourceinstall: fpc_zipsourceinstall
 
+clean: fpc_clean
+
 distclean: fpc_distclean
 
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall distclean cleanall info
+.PHONY:  all debug smart shared showinstall install sourceinstall exampleinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Exes
@@ -958,7 +937,7 @@ endif
 # SourceInstall rules
 #####################################################################
 
-.PHONY: fpc_sourceinstall
+.PHONY: fpc_sourceinstall fpc_exampleinstall
 
 ifndef SOURCETOPDIR
 SOURCETOPDIR=$(BASEDIR)
@@ -968,6 +947,10 @@ fpc_sourceinstall: clean
 	$(MKDIR) $(SOURCEINSTALLDIR)
 	$(COPYTREE) $(SOURCETOPDIR) $(SOURCEINSTALLDIR)
 
+fpc_exampleinstall: clean
+	$(MKDIR) $(EXAMPLEINSTALLDIR)
+	$(COPYTREE) $(EXAMPLESRC) $(EXAMPLEINSTALLDIR)
+
 #####################################################################
 # Zip
 #####################################################################
@@ -1024,11 +1007,14 @@ endif
 	$(DELTREE) $(PACKDIR)
 endif
 
-.PHONY:  fpc_zipsourceinstall
+.PHONY:  fpc_zipexampleinstall
 
 fpc_zipsourceinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall PACKAGESUFFIX=src
 
+fpc_zipexampleinstall:
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall PACKAGESUFFIX=exm
+
 #####################################################################
 # Clean rules
 #####################################################################
@@ -1145,28 +1131,3 @@ ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
 
-#####################################################################
-# Users rules
-#####################################################################
-
-ifeq ($(OS_TARGET),win32)
-vpath %$(PASEXT) win32
-endif
-
-clean : execlean fpc_cleanall
-
-execlean:
-
-#################################
-# Demo installation for linux
-#
-
-.PHONY: installexamples
-
-ifndef EXAMPLESINSTALLDIR
-EXAMPLESINSTALLDIR=$(DOCINSTALLDIR)/examples
-endif
-
-installexamples:
-	$(MKDIR) $(EXAMPLESINSTALLDIR)
-	$(COPYTREE) * $(EXAMPLESINSTALLDIR)

install/demo/modex/Makefile.fpc

@@ -5,41 +5,6 @@
 [targets]
 programs_go32v2=voxel
 
-[require]
-# Not always necessary, but saves a lot of trouble
-packages=api
-
-[install]
-
-[defaults]
-defaultrule=all
-
 [dirs]
 fpcdir=../..
 targetdir=.
-
-[postsettings]
-
-[rules]
-ifeq ($(OS_TARGET),win32)
-vpath %$(PASEXT) win32
-endif
-
-clean : execlean fpc_cleanall
-
-execlean:
-
-#################################
-# Demo installation for linux
-#
-
-.PHONY: installexamples
-
-ifndef EXAMPLESINSTALLDIR
-EXAMPLESINSTALLDIR=$(DOCINSTALLDIR)/examples
-endif
-
-installexamples:
-        $(MKDIR) $(EXAMPLESINSTALLDIR)
-        $(COPYTREE) * $(EXAMPLESINSTALLDIR)
-

install/demo/text/Makefile

@@ -204,7 +204,7 @@ endif
 
 # Packages
 
-override PACKAGES+=rtl api
+override PACKAGES+=rtl
 
 # Libraries
 
@@ -499,7 +499,6 @@ endif
 # PACKAGESDIR packages
 
 PACKAGERTL=1
-PACKAGEAPI=1
 
 ifdef PACKAGERTL
 ifneq ($(wildcard $(FPCDIR)/rtl),)
@@ -530,35 +529,6 @@ ifdef UNITDIR_RTL
 override NEEDUNITDIR+=$(UNITDIR_RTL)
 endif
 endif
-ifdef PACKAGEAPI
-ifneq ($(wildcard $(FPCDIR)/api),)
-ifneq ($(wildcard $(FPCDIR)/api/$(OS_TARGET)),)
-PACKAGEDIR_API=$(FPCDIR)/api/$(OS_TARGET)
-else
-PACKAGEDIR_API=$(FPCDIR)/api
-endif
-ifeq ($(wildcard $(PACKAGEDIR_API)/$(FPCMADE)),)
-override COMPILEPACKAGES+=package_api
-package_api:
-	$(MAKE) -C $(PACKAGEDIR_API) all
-endif
-UNITDIR_API=$(PACKAGEDIR_API)
-else
-PACKAGEDIR_API=
-ifneq ($(wildcard $(UNITSDIR)/api),)
-ifneq ($(wildcard $(UNITSDIR)/api/$(OS_TARGET)),)
-UNITDIR_API=$(UNITSDIR)/api/$(OS_TARGET)
-else
-UNITDIR_API=$(UNITSDIR)/api
-endif
-else
-UNITDIR_API=
-endif
-endif
-ifdef UNITDIR_API
-override NEEDUNITDIR+=$(UNITDIR_API)
-endif
-endif
 
 
 #####################################################################
@@ -632,6 +602,11 @@ SOURCEINSTALLDIR:=$(SOURCEINSTALLDIR)/$(SOURCESUBDIR)
 endif
 endif
 
+# Where the example files will be stored
+ifndef EXAMPLEINSTALLDIR
+EXAMPLEINSTALLDIR=$(SOURCEINSTALLDIR)
+endif
+
 # Where the doc files will be stored
 ifndef DOCINSTALLDIR
 ifdef inlinux
@@ -796,17 +771,21 @@ install: fpc_install
 
 sourceinstall: fpc_sourceinstall
 
+exampleinstall: fpc_exampleinstall
+
 zipinstall: fpc_zipinstall
 
 zipsourceinstall: fpc_zipsourceinstall
 
+clean: fpc_clean
+
 distclean: fpc_distclean
 
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall distclean cleanall info
+.PHONY:  all debug smart shared showinstall install sourceinstall exampleinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Exes
@@ -956,7 +935,7 @@ endif
 # SourceInstall rules
 #####################################################################
 
-.PHONY: fpc_sourceinstall
+.PHONY: fpc_sourceinstall fpc_exampleinstall
 
 ifndef SOURCETOPDIR
 SOURCETOPDIR=$(BASEDIR)
@@ -966,6 +945,10 @@ fpc_sourceinstall: clean
 	$(MKDIR) $(SOURCEINSTALLDIR)
 	$(COPYTREE) $(SOURCETOPDIR) $(SOURCEINSTALLDIR)
 
+fpc_exampleinstall: clean
+	$(MKDIR) $(EXAMPLEINSTALLDIR)
+	$(COPYTREE) $(EXAMPLESRC) $(EXAMPLEINSTALLDIR)
+
 #####################################################################
 # Zip
 #####################################################################
@@ -1022,11 +1005,14 @@ endif
 	$(DELTREE) $(PACKDIR)
 endif
 
-.PHONY:  fpc_zipsourceinstall
+.PHONY:  fpc_zipexampleinstall
 
 fpc_zipsourceinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall PACKAGESUFFIX=src
 
+fpc_zipexampleinstall:
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall PACKAGESUFFIX=exm
+
 #####################################################################
 # Clean rules
 #####################################################################
@@ -1143,28 +1129,3 @@ ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
 
-#####################################################################
-# Users rules
-#####################################################################
-
-ifeq ($(OS_TARGET),win32)
-vpath %$(PASEXT) win32
-endif
-
-clean : execlean fpc_cleanall
-
-execlean:
-
-#################################
-# Demo installation for linux
-#
-
-.PHONY: installexamples
-
-ifndef EXAMPLESINSTALLDIR
-EXAMPLESINSTALLDIR=$(DOCINSTALLDIR)/examples
-endif
-
-installexamples:
-	$(MKDIR) $(EXAMPLESINSTALLDIR)
-	$(COPYTREE) * $(EXAMPLESINSTALLDIR)

install/demo/text/Makefile.fpc

@@ -5,39 +5,6 @@
 [targets]
 programs=eratos qsort hello blackbox magic lines
 
-[require]
-# Not always necessary, but saves a lot of trouble
-packages=api
-
-[defaults]
-defaultrule=all
-
 [dirs]
 fpcdir=../..
 targetdir=.
-
-[postsettings]
-
-[rules]
-ifeq ($(OS_TARGET),win32)
-vpath %$(PASEXT) win32
-endif
-
-clean : execlean fpc_cleanall
-
-execlean:
-
-#################################
-# Demo installation for linux
-#
-
-.PHONY: installexamples
-
-ifndef EXAMPLESINSTALLDIR
-EXAMPLESINSTALLDIR=$(DOCINSTALLDIR)/examples
-endif
-
-installexamples:
-        $(MKDIR) $(EXAMPLESINSTALLDIR)
-        $(COPYTREE) * $(EXAMPLESINSTALLDIR)
-

install/demo/win32/Makefile

@@ -206,7 +206,7 @@ endif
 
 # Packages
 
-override PACKAGES+=rtl api
+override PACKAGES+=rtl
 
 # Libraries
 
@@ -501,7 +501,6 @@ endif
 # PACKAGESDIR packages
 
 PACKAGERTL=1
-PACKAGEAPI=1
 
 ifdef PACKAGERTL
 ifneq ($(wildcard $(FPCDIR)/rtl),)
@@ -532,35 +531,6 @@ ifdef UNITDIR_RTL
 override NEEDUNITDIR+=$(UNITDIR_RTL)
 endif
 endif
-ifdef PACKAGEAPI
-ifneq ($(wildcard $(FPCDIR)/api),)
-ifneq ($(wildcard $(FPCDIR)/api/$(OS_TARGET)),)
-PACKAGEDIR_API=$(FPCDIR)/api/$(OS_TARGET)
-else
-PACKAGEDIR_API=$(FPCDIR)/api
-endif
-ifeq ($(wildcard $(PACKAGEDIR_API)/$(FPCMADE)),)
-override COMPILEPACKAGES+=package_api
-package_api:
-	$(MAKE) -C $(PACKAGEDIR_API) all
-endif
-UNITDIR_API=$(PACKAGEDIR_API)
-else
-PACKAGEDIR_API=
-ifneq ($(wildcard $(UNITSDIR)/api),)
-ifneq ($(wildcard $(UNITSDIR)/api/$(OS_TARGET)),)
-UNITDIR_API=$(UNITSDIR)/api/$(OS_TARGET)
-else
-UNITDIR_API=$(UNITSDIR)/api
-endif
-else
-UNITDIR_API=
-endif
-endif
-ifdef UNITDIR_API
-override NEEDUNITDIR+=$(UNITDIR_API)
-endif
-endif
 
 
 #####################################################################
@@ -634,6 +604,11 @@ SOURCEINSTALLDIR:=$(SOURCEINSTALLDIR)/$(SOURCESUBDIR)
 endif
 endif
 
+# Where the example files will be stored
+ifndef EXAMPLEINSTALLDIR
+EXAMPLEINSTALLDIR=$(SOURCEINSTALLDIR)
+endif
+
 # Where the doc files will be stored
 ifndef DOCINSTALLDIR
 ifdef inlinux
@@ -798,17 +773,21 @@ install: fpc_install
 
 sourceinstall: fpc_sourceinstall
 
+exampleinstall: fpc_exampleinstall
+
 zipinstall: fpc_zipinstall
 
 zipsourceinstall: fpc_zipsourceinstall
 
+clean: fpc_clean
+
 distclean: fpc_distclean
 
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall distclean cleanall info
+.PHONY:  all debug smart shared showinstall install sourceinstall exampleinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Exes
@@ -958,7 +937,7 @@ endif
 # SourceInstall rules
 #####################################################################
 
-.PHONY: fpc_sourceinstall
+.PHONY: fpc_sourceinstall fpc_exampleinstall
 
 ifndef SOURCETOPDIR
 SOURCETOPDIR=$(BASEDIR)
@@ -968,6 +947,10 @@ fpc_sourceinstall: clean
 	$(MKDIR) $(SOURCEINSTALLDIR)
 	$(COPYTREE) $(SOURCETOPDIR) $(SOURCEINSTALLDIR)
 
+fpc_exampleinstall: clean
+	$(MKDIR) $(EXAMPLEINSTALLDIR)
+	$(COPYTREE) $(EXAMPLESRC) $(EXAMPLEINSTALLDIR)
+
 #####################################################################
 # Zip
 #####################################################################
@@ -1024,11 +1007,14 @@ endif
 	$(DELTREE) $(PACKDIR)
 endif
 
-.PHONY:  fpc_zipsourceinstall
+.PHONY:  fpc_zipexampleinstall
 
 fpc_zipsourceinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall PACKAGESUFFIX=src
 
+fpc_zipexampleinstall:
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall PACKAGESUFFIX=exm
+
 #####################################################################
 # Clean rules
 #####################################################################
@@ -1145,28 +1131,3 @@ ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
 
-#####################################################################
-# Users rules
-#####################################################################
-
-ifeq ($(OS_TARGET),win32)
-vpath %$(PASEXT) win32
-endif
-
-clean : execlean fpc_cleanall
-
-execlean :
-
-#################################
-# Demo installation for linux
-#
-
-.PHONY: installexamples
-
-ifndef EXAMPLESINSTALLDIR
-EXAMPLESINSTALLDIR=$(DOCINSTALLDIR)/examples
-endif
-
-installexamples:
-	$(MKDIR) $(EXAMPLESINSTALLDIR)
-	$(COPYTREE) * $(EXAMPLESINSTALLDIR)

install/demo/win32/Makefile.fpc

@@ -5,41 +5,6 @@
 [targets]
 programs_win32=winhello menu dlltest testdll edit
 
-[require]
-# Not always necessary, but saves a lot of trouble
-packages=api
-
-[install]
-
-[defaults]
-defaultrule=all
-
 [dirs]
 fpcdir=../..
 targetdir=.
-
-[postsettings]
-
-[rules]
-ifeq ($(OS_TARGET),win32)
-vpath %$(PASEXT) win32
-endif
-
-clean : execlean fpc_cleanall
-
-execlean :
-
-#################################
-# Demo installation for linux
-#
-
-.PHONY: installexamples
-
-ifndef EXAMPLESINSTALLDIR
-EXAMPLESINSTALLDIR=$(DOCINSTALLDIR)/examples
-endif
-
-installexamples:
-        $(MKDIR) $(EXAMPLESINSTALLDIR)
-        $(COPYTREE) * $(EXAMPLESINSTALLDIR)
-

install/fpc-0.99.15.spec

@@ -39,16 +39,17 @@ NEWPP=`pwd`/compiler/ppc386
 export FPCDIR=
 NEWPP=`pwd`/compiler/ppc386
 NEWPPUFILES=`pwd`/utils/ppufiles
-	make compiler_install PP=${NEWPP} PPUFILES=${NEWPPUFILES}
-	make rtl_install PP=${NEWPP} PPUFILES=${NEWPPUFILES}
-	make fcl_install PP=${NEWPP} PPUFILES=${NEWPPUFILES}
-	make api_install PP=${NEWPP} PPUFILES=${NEWPPUFILES}
-	make packages_install PP=${NEWPP} PPUFILES=${NEWPPUFILES}
-	make utils_install PP=${NEWPP} PPUFILES=${NEWPPUFILES}
+INSTALLOPTS=PP=${NEWPP} PPUFILES=${NEWPPUFILES} PREFIXINSTALLDIR=/usr
+	make compiler_install ${INSTALLOPTS}
+	make rtl_install ${INSTALLOPTS}
+	make fcl_install ${INSTALLOPTS}
+	make api_install ${INSTALLOPTS}
+	make packages_install ${INSTALLOPTS}
+	make utils_install ${INSTALLOPTS}
 
-	make demo_install PP=${NEWPP} DOCINSTALLDIR=%{docdir}
-	make doc_install PP=${NEWPP} DOCINSTALLDIR=%{docdir}
-	make man_install PP=${NEWPP}
+	make demo_install ${INSTALLOPTS} DOCINSTALLDIR=%{docdir}
+	make doc_install ${INSTALLOPTS} DOCINSTALLDIR=%{docdir}
+	make man_install ${INSTALLOPTS}
 	
 %clean
 	make compiler_clean