* Makefile fixes

compiler/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -177,6 +177,7 @@ endif
 override LOCALOPT+=$(LOCALDEF)
 override FPCOPT:=$(LOCALOPT)
 override TARGET_DIRS+=utils
+override INSTALL_FPCPACKAGE=y
 override COMPILER_INCLUDEDIR+=$(CPU_TARGET)
 override COMPILER_UNITDIR+=$(CPU_TARGET) targets
 override COMPILER_TARGETDIR+=.
@@ -414,7 +415,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -424,56 +429,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -703,13 +733,13 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR
 ifndef inUnix
-PACKDIR=$(BASEDIR)/../pack_tmp/$(PACKAGE_NAME)
+PACKDIR=$(BASEDIR)/../fpc-pack
 else
-PACKDIR=/tmp/fpc-pack/$(PACKAGE_NAME)
+PACKDIR=/tmp/fpc-pack
 endif
 endif
 ifndef ZIPNAME
@@ -811,7 +841,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -881,17 +911,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 TARGET_DIRS_UTILS=1
 ifdef TARGET_DIRS_UTILS

compiler/Makefile.fpc

@@ -18,6 +18,9 @@ includedir=$(CPU_TARGET)
 packages=rtl
 tools=diff cmp
 
+[install]
+fpcpackage=y
+
 [default]
 fpcdir=..
 

compiler/new/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -406,7 +406,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -416,56 +420,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -695,13 +724,13 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR
 ifndef inUnix
-PACKDIR=$(BASEDIR)/../pack_tmp/$(PACKAGE_NAME)
+PACKDIR=$(BASEDIR)/../fpc-pack
 else
-PACKDIR=/tmp/fpc-pack/$(PACKAGE_NAME)
+PACKDIR=/tmp/fpc-pack
 endif
 endif
 ifndef ZIPNAME
@@ -803,7 +832,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -873,17 +902,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 ifndef DIFF
 DIFF:=$(strip $(wildcard $(addsuffix /diff$(SRCEXEEXT),$(SEARCHPATH))))

compiler/utils/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -119,6 +119,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove
 override CLEAN_UNITS+=ppu crc
+override INSTALL_FPCPACKAGE=y
 override COMPILER_UNITDIR+=..
 override COMPILER_SOURCEDIR+=..
 override COMPILER_TARGETDIR+=.
@@ -356,7 +357,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -366,56 +371,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -657,7 +687,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -694,7 +724,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -764,17 +794,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug

compiler/utils/Makefile.fpc

@@ -13,6 +13,9 @@ targetdir=.
 unitdir=..
 sourcedir=..
 
+[install]
+fpcpackage=y
+
 [default]
 fpcdir=../..
 

fcl/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -131,7 +131,8 @@ ifeq ($(OS_TARGET),freebsd)
 override TARGET_UNITS+=process asyncio ssockets http
 endif
 override TARGET_RSTS+=classes ssockets cachecls
-override TARGET_EXAMPLEDIRS+=tests db/tests shedit/gtk
+override TARGET_EXAMPLEDIRS+=tests
+override INSTALL_FPCPACKAGE=y
 override COMPILER_OPTIONS+=-S2
 override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc
 ifeq ($(OS_TARGET),linux)
@@ -376,7 +377,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -386,56 +391,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -825,13 +855,13 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR
 ifndef inUnix
-PACKDIR=$(BASEDIR)/../pack_tmp/$(PACKAGE_NAME)
+PACKDIR=$(BASEDIR)/../fpc-pack
 else
-PACKDIR=/tmp/fpc-pack/$(PACKAGE_NAME)
+PACKDIR=/tmp/fpc-pack
 endif
 endif
 ifndef ZIPNAME
@@ -933,7 +963,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -1003,17 +1033,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 TARGET_DIRS_XML=1
 TARGET_DIRS_DB=1
@@ -1136,8 +1168,6 @@ shedit:
 .PHONY: shedit_all shedit_debug shedit_examples shedit_smart shedit_shared shedit_install shedit_sourceinstall shedit_exampleinstall shedit_distinstall shedit_zipinstall shedit_zipsourceinstall shedit_zipexampleinstall shedit_zipdistinstall shedit_clean shedit_distclean shedit_cleanall shedit_info shedit
 endif
 TARGET_EXAMPLEDIRS_TESTS=1
-TARGET_EXAMPLEDIRS_DB/TESTS=1
-TARGET_EXAMPLEDIRS_SHEDIT/GTK=1
 ifdef TARGET_EXAMPLEDIRS_TESTS
 tests_all:
 	$(MAKE) -C tests all
@@ -1177,84 +1207,6 @@ tests:
 	$(MAKE) -C tests all
 .PHONY: tests_all tests_debug tests_examples tests_smart tests_shared tests_install tests_sourceinstall tests_exampleinstall tests_distinstall tests_zipinstall tests_zipsourceinstall tests_zipexampleinstall tests_zipdistinstall tests_clean tests_distclean tests_cleanall tests_info tests
 endif
-ifdef TARGET_EXAMPLEDIRS_DB/TESTS
-db/tests_all:
-	$(MAKE) -C db/tests all
-db/tests_debug:
-	$(MAKE) -C db/tests debug
-db/tests_examples:
-	$(MAKE) -C db/tests examples
-db/tests_smart:
-	$(MAKE) -C db/tests smart
-db/tests_shared:
-	$(MAKE) -C db/tests shared
-db/tests_install:
-	$(MAKE) -C db/tests install
-db/tests_sourceinstall:
-	$(MAKE) -C db/tests sourceinstall
-db/tests_exampleinstall:
-	$(MAKE) -C db/tests exampleinstall
-db/tests_distinstall:
-	$(MAKE) -C db/tests distinstall
-db/tests_zipinstall:
-	$(MAKE) -C db/tests zipinstall
-db/tests_zipsourceinstall:
-	$(MAKE) -C db/tests zipsourceinstall
-db/tests_zipexampleinstall:
-	$(MAKE) -C db/tests zipexampleinstall
-db/tests_zipdistinstall:
-	$(MAKE) -C db/tests zipdistinstall
-db/tests_clean:
-	$(MAKE) -C db/tests clean
-db/tests_distclean:
-	$(MAKE) -C db/tests distclean
-db/tests_cleanall:
-	$(MAKE) -C db/tests cleanall
-db/tests_info:
-	$(MAKE) -C db/tests info
-db/tests:
-	$(MAKE) -C db/tests all
-.PHONY: db/tests_all db/tests_debug db/tests_examples db/tests_smart db/tests_shared db/tests_install db/tests_sourceinstall db/tests_exampleinstall db/tests_distinstall db/tests_zipinstall db/tests_zipsourceinstall db/tests_zipexampleinstall db/tests_zipdistinstall db/tests_clean db/tests_distclean db/tests_cleanall db/tests_info db/tests
-endif
-ifdef TARGET_EXAMPLEDIRS_SHEDIT/GTK
-shedit/gtk_all:
-	$(MAKE) -C shedit/gtk all
-shedit/gtk_debug:
-	$(MAKE) -C shedit/gtk debug
-shedit/gtk_examples:
-	$(MAKE) -C shedit/gtk examples
-shedit/gtk_smart:
-	$(MAKE) -C shedit/gtk smart
-shedit/gtk_shared:
-	$(MAKE) -C shedit/gtk shared
-shedit/gtk_install:
-	$(MAKE) -C shedit/gtk install
-shedit/gtk_sourceinstall:
-	$(MAKE) -C shedit/gtk sourceinstall
-shedit/gtk_exampleinstall:
-	$(MAKE) -C shedit/gtk exampleinstall
-shedit/gtk_distinstall:
-	$(MAKE) -C shedit/gtk distinstall
-shedit/gtk_zipinstall:
-	$(MAKE) -C shedit/gtk zipinstall
-shedit/gtk_zipsourceinstall:
-	$(MAKE) -C shedit/gtk zipsourceinstall
-shedit/gtk_zipexampleinstall:
-	$(MAKE) -C shedit/gtk zipexampleinstall
-shedit/gtk_zipdistinstall:
-	$(MAKE) -C shedit/gtk zipdistinstall
-shedit/gtk_clean:
-	$(MAKE) -C shedit/gtk clean
-shedit/gtk_distclean:
-	$(MAKE) -C shedit/gtk distclean
-shedit/gtk_cleanall:
-	$(MAKE) -C shedit/gtk cleanall
-shedit/gtk_info:
-	$(MAKE) -C shedit/gtk info
-shedit/gtk:
-	$(MAKE) -C shedit/gtk all
-.PHONY: shedit/gtk_all shedit/gtk_debug shedit/gtk_examples shedit/gtk_smart shedit/gtk_shared shedit/gtk_install shedit/gtk_sourceinstall shedit/gtk_exampleinstall shedit/gtk_distinstall shedit/gtk_zipinstall shedit/gtk_zipsourceinstall shedit/gtk_zipexampleinstall shedit/gtk_zipdistinstall shedit/gtk_clean shedit/gtk_distclean shedit/gtk_cleanall shedit/gtk_info shedit/gtk
-endif
 all: fpc_all $(addsuffix _all,$(TARGET_DIRS))
 debug: fpc_debug $(addsuffix _debug,$(TARGET_DIRS))
 examples: fpc_examples $(addsuffix _examples,$(TARGET_DIRS))

fcl/Makefile.fpc

@@ -17,7 +17,7 @@ units_freebsd=process asyncio ssockets http
 units_linux=process asyncio ssockets http
 units_win32=process fileinfo
 rsts=classes ssockets cachecls
-exampledirs=tests db/tests shedit/gtk
+exampledirs=tests
 
 [compiler]
 options=-S2
@@ -30,5 +30,8 @@ sourcedir=$(OS_TARGET) inc
 [libs]
 libname=fpfcl
 
+[install]
+fpcpackage=y
+
 [default]
 fpcdir=..

fcl/db/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -127,6 +127,7 @@ override TARGET_DIRS+=mysql interbase
 endif
 override TARGET_UNITS+=db ddg_ds ddg_rec
 override TARGET_EXAMPLEDIRS+=tests
+override INSTALL_FPCPACKAGE=y
 override COMPILER_OPTIONS+=-S2
 override COMPILER_TARGETDIR+=../$(OS_TARGET)
 ifndef ECHO
@@ -363,7 +364,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -373,56 +378,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -748,7 +778,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -785,7 +815,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -855,17 +885,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 TARGET_DIRS_DBASE=1
 ifeq ($(OS_TARGET),linux)

fcl/db/Makefile.fpc

@@ -16,6 +16,9 @@ exampledirs=tests
 options=-S2
 targetdir=../$(OS_TARGET)
 
+[install]
+fpcpackage=y
+
 [default]
 fpcdir=../..
 

fcl/db/dbase/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -120,6 +120,7 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=fcl
 override TARGET_UNITS+=dbf
 override TARGET_EXAMPLES+=testdbf
+override INSTALL_FPCPACKAGE=y
 override COMPILER_OPTIONS+=-S2 -Sh
 override COMPILER_TARGETDIR+=../../$(OS_TARGET)
 ifndef ECHO
@@ -356,7 +357,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -366,56 +371,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -668,7 +698,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -705,7 +735,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -775,17 +805,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug

fcl/db/dbase/Makefile.fpc

@@ -13,5 +13,8 @@ examples=testdbf
 options=-S2 -Sh
 targetdir=../../$(OS_TARGET)
 
+[install]
+fpcpackage=y
+
 [default]
 fpcdir=../../..

fcl/db/interbase/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -120,6 +120,7 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=fcl
 override TARGET_UNITS+=interbase
 override TARGET_EXAMPLES+=testib
+override INSTALL_FPCPACKAGE=y
 override COMPILER_OPTIONS+=-S2
 override COMPILER_TARGETDIR+=../../$(OS_TARGET)
 ifndef ECHO
@@ -356,7 +357,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -366,56 +371,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -715,7 +745,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -752,7 +782,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -822,17 +852,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug

fcl/db/interbase/Makefile.fpc

@@ -16,5 +16,8 @@ packages=ibase
 options=-S2 
 targetdir=../../$(OS_TARGET)
 
+[install]
+fpcpackage=y
+
 [default]
 fpcdir=../../..

fcl/db/mysql/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -120,6 +120,7 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=fcl
 override TARGET_UNITS+=mysqldb
 override TARGET_EXAMPLES+=testm
+override INSTALL_FPCPACKAGE=y
 override COMPILER_OPTIONS+=-S2
 override COMPILER_TARGETDIR+=../../$(OS_TARGET)
 ifndef ECHO
@@ -356,7 +357,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -366,56 +371,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -715,7 +745,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -752,7 +782,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -822,17 +852,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug

fcl/db/mysql/Makefile.fpc

@@ -16,5 +16,8 @@ packages=mysql
 options=-S2 
 targetdir=../../$(OS_TARGET)
 
+[install]
+fpcpackage=y
+
 [default]
 fpcdir=../../..

fcl/db/tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -118,6 +118,7 @@ endif
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override TARGET_PROGRAMS+=testds createds tested
+override INSTALL_FPCPACKAGE=y
 override COMPILER_OPTIONS+=-S2
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
@@ -353,7 +354,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -363,56 +368,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -819,7 +849,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -856,7 +886,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -926,17 +956,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug

fcl/db/tests/Makefile.fpc

@@ -11,5 +11,8 @@ packages=fcl
 [compiler]
 options=-S2
 
+[install]
+fpcpackage=y
+
 [default]
 fpcdir=../../..

fcl/shedit/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -119,6 +119,8 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=fcl
 override TARGET_UNITS+=doc_text shedit sh_xml sh_pas
+override TARGET_EXAMPLEDIRS+=gtk
+override INSTALL_FPCPACKAGE=y
 override COMPILER_OPTIONS+=-S2
 override COMPILER_TARGETDIR+=../$(OS_TARGET)
 ifndef ECHO
@@ -355,7 +357,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -365,56 +371,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -571,6 +602,21 @@ override INSTALLPPUFILES+=$(UNITPPUFILES)
 override CLEANPPUFILES+=$(UNITPPUFILES)
 endif
 fpc_units: $(UNITPPUFILES)
+.PHONY: fpc_examples fpc_test
+ifdef TARGET_EXAMPLES
+HASEXAMPLES=1
+override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))
+override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))
+override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addprefix $(LIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES)))
+override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)
+ifeq ($(OS_TARGET),os2)
+override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))
+endif
+endif
+ifdef TARGET_EXAMPLEDIRS
+HASEXAMPLES=1
+endif
+fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
 .PHONY: fpc_packages fpc_all fpc_smart fpc_debug
 $(FPCMADE): $(ALLTARGET)
 	@$(ECHO) Compiled > $(FPCMADE)
@@ -652,7 +698,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -689,7 +735,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -759,18 +805,60 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
+TARGET_EXAMPLEDIRS_GTK=1
+ifdef TARGET_EXAMPLEDIRS_GTK
+gtk_all:
+	$(MAKE) -C gtk all
+gtk_debug:
+	$(MAKE) -C gtk debug
+gtk_examples:
+	$(MAKE) -C gtk examples
+gtk_smart:
+	$(MAKE) -C gtk smart
+gtk_shared:
+	$(MAKE) -C gtk shared
+gtk_install:
+	$(MAKE) -C gtk install
+gtk_sourceinstall:
+	$(MAKE) -C gtk sourceinstall
+gtk_exampleinstall:
+	$(MAKE) -C gtk exampleinstall
+gtk_distinstall:
+	$(MAKE) -C gtk distinstall
+gtk_zipinstall:
+	$(MAKE) -C gtk zipinstall
+gtk_zipsourceinstall:
+	$(MAKE) -C gtk zipsourceinstall
+gtk_zipexampleinstall:
+	$(MAKE) -C gtk zipexampleinstall
+gtk_zipdistinstall:
+	$(MAKE) -C gtk zipdistinstall
+gtk_clean:
+	$(MAKE) -C gtk clean
+gtk_distclean:
+	$(MAKE) -C gtk distclean
+gtk_cleanall:
+	$(MAKE) -C gtk cleanall
+gtk_info:
+	$(MAKE) -C gtk info
+gtk:
+	$(MAKE) -C gtk all
+.PHONY: gtk_all gtk_debug gtk_examples gtk_smart gtk_shared gtk_install gtk_sourceinstall gtk_exampleinstall gtk_distinstall gtk_zipinstall gtk_zipsourceinstall gtk_zipexampleinstall gtk_zipdistinstall gtk_clean gtk_distclean gtk_cleanall gtk_info gtk
+endif
 all: fpc_all
 debug: fpc_debug
 examples: fpc_examples
@@ -784,7 +872,7 @@ zipinstall:
 zipsourceinstall:
 zipexampleinstall:
 zipdistinstall:
-clean: fpc_clean
+clean: fpc_clean $(addsuffix _clean,$(TARGET_EXAMPLEDIRS))
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info

fcl/shedit/Makefile.fpc

@@ -7,10 +7,14 @@ main=fcl
 
 [target]
 units=doc_text shedit sh_xml sh_pas
+exampledirs=gtk
 
 [compiler]
 options=-S2
 targetdir=../$(OS_TARGET)
 
+[install]
+fpcpackage=y
+
 [default]
 fpcdir=../..

fcl/shedit/gtk/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -91,6 +91,14 @@ else
 override FPCDIR=wrong
 endif
 ifeq ($(FPCDIR),wrong)
+override FPCDIR=../../..
+ifeq ($(wildcard $(FPCDIR)/rtl),)
+ifeq ($(wildcard $(FPCDIR)/units),)
+override FPCDIR=wrong
+endif
+endif
+endif
+ifeq ($(FPCDIR),wrong)
 ifdef inUnix
 override FPCDIR=/usr/local/lib/fpc/$(FPC_VERSION)
 ifeq ($(wildcard $(FPCDIR)/units),)
@@ -111,6 +119,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override TARGET_PROGRAMS+=gtkdemo
 override TARGET_UNITS+=gtkshedit
+override INSTALL_FPCPACKAGE=y
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -345,7 +354,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -355,56 +368,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -911,7 +949,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -948,7 +986,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -1018,17 +1056,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug

fcl/shedit/gtk/Makefile.fpc

@@ -8,3 +8,10 @@ programs=gtkdemo
 
 [require]
 packages=fcl gtk
+
+[install]
+fpcpackage=y
+
+[default]
+fpcdir=../../..
+

fcl/tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -124,6 +124,7 @@ endif
 ifeq ($(OS_TARGET),win32)
 override TARGET_PROGRAMS+=showver testproc
 endif
+override INSTALL_FPCPACKAGE=y
 override COMPILER_OPTIONS+=-S2
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
@@ -359,7 +360,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -369,56 +374,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -825,7 +855,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -862,7 +892,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -932,17 +962,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug

fcl/tests/Makefile.fpc

@@ -17,5 +17,8 @@ packages=fcl
 [compiler]
 options=-S2
 
+[install]
+fpcpackage=y
+
 [default]
 fpcdir=../..

fcl/xml/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -119,6 +119,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=fcl
 override TARGET_UNITS+=dom htmldoc xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite
+override INSTALL_FPCPACKAGE=y
 override COMPILER_OPTIONS+=-S2
 override COMPILER_TARGETDIR+=../$(OS_TARGET)
 ifndef ECHO
@@ -355,7 +356,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -365,56 +370,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -652,7 +682,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -689,7 +719,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -759,17 +789,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug

fcl/xml/Makefile.fpc

@@ -12,5 +12,8 @@ units=dom htmldoc xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite
 options=-S2
 targetdir=../$(OS_TARGET)
 
+[install]
+fpcpackage=y
+
 [default]
 fpcdir=../..

ide/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -91,6 +91,14 @@ else
 override FPCDIR=wrong
 endif
 ifeq ($(FPCDIR),wrong)
+override FPCDIR=..
+ifeq ($(wildcard $(FPCDIR)/rtl),)
+ifeq ($(wildcard $(FPCDIR)/units),)
+override FPCDIR=wrong
+endif
+endif
+endif
+ifeq ($(FPCDIR),wrong)
 ifdef inUnix
 override FPCDIR=/usr/local/lib/fpc/$(FPC_VERSION)
 ifeq ($(wildcard $(FPCDIR)/units),)
@@ -113,6 +121,7 @@ override PACKAGE_NAME=ide
 override PACKAGE_VERSION=1.0.5
 override DEFAULT_DIR=text
 override TARGET_DIRS+=fake text
+override INSTALL_FPCPACKAGE=y
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -347,7 +356,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -357,56 +370,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -593,13 +631,13 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR
 ifndef inUnix
-PACKDIR=$(BASEDIR)/../pack_tmp/$(PACKAGE_NAME)
+PACKDIR=$(BASEDIR)/../fpc-pack
 else
-PACKDIR=/tmp/fpc-pack/$(PACKAGE_NAME)
+PACKDIR=/tmp/fpc-pack
 endif
 endif
 ifndef ZIPNAME
@@ -701,7 +739,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -771,17 +809,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 TARGET_DIRS_FAKE=1
 TARGET_DIRS_TEXT=1

ide/Makefile.fpc

@@ -9,7 +9,11 @@ version=1.0.5
 [target]
 dirs=fake text
 
+[install]
+fpcpackage=y
+
 [default]
+fpcdir=..
 dir=text
 
 [rules]

ide/fake/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -344,7 +344,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -354,56 +358,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -590,7 +619,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -627,7 +656,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -697,17 +726,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 TARGET_DIRS_COMPILER=1
 TARGET_DIRS_GDB=1

ide/fake/compiler/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -344,7 +344,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -354,56 +358,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -641,7 +670,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -678,7 +707,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -748,17 +777,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug

ide/fake/gdb/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -344,7 +344,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -354,56 +358,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -641,7 +670,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -678,7 +707,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -748,17 +777,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug

ide/text/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -127,11 +127,7 @@ ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
 override FPCOPT+=-dUNIX
 endif
 endif
-ifdef FAKE
-COMPILERDIR=../fake/compiler
-else
 COMPILERDIR=compiler
-endif
 ifndef GDBINT
 GDBINT=gdbint
 endif
@@ -169,6 +165,7 @@ endif
 override TARGET_DIRS+=compiler
 override TARGET_PROGRAMS+=fp
 override INSTALL_DATADIR=$(INSTALL_BASEDIR)/ide
+override INSTALL_FPCPACKAGE=y
 override COMPILER_OPTIONS+=-Sg
 override COMPILER_UNITDIR+=$(COMPILERDIR)
 override COMPILER_TARGETDIR+=.
@@ -406,7 +403,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -416,56 +417,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -786,7 +812,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -823,7 +849,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -893,17 +919,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 TARGET_DIRS_COMPILER=1
 ifdef TARGET_DIRS_COMPILER
@@ -997,12 +1025,12 @@ full: all
 fullgdb: gdb
 clean: cleanall
 ifndef UNIXINSTALLDIR
-override DATAINSTALLDIR=$(BININSTALLDIR)
+override INSTALL_DATADIR=$(INSTALL_BINDIR)
 endif
 install: fpc_install
-	$(MKDIR) $(DATAINSTALLDIR)
-	$(MKDIR) $(DOCINSTALLDIR)
-	$(INSTALL) fp.ans $(wildcard *.pt) $(wildcard *.tdf) $(DATAINSTALLDIR)
-	$(INSTALL) readme.ide $(DOCINSTALLDIR)
+	$(MKDIR) $(INSTALL_DATADIR)
+	$(MKDIR) $(INSTALL_DOCDIR)
+	$(INSTALL) fp.ans $(wildcard *.pt) $(wildcard *.tdf) $(INSTALL_DATADIR)
+	$(INSTALL) readme.ide $(INSTALL_DOCDIR)
 clean_compiler:
 	$(MAKE) -C ../../compiler clean

ide/text/Makefile.fpc

@@ -10,6 +10,7 @@ rst=fpstrings
 
 [install]
 datadir=$(INSTALL_BASEDIR)/ide
+fpcpackage=y
 
 [compiler]
 options=-Sg
@@ -19,9 +20,6 @@ unitdir=$(COMPILERDIR)
 [require]
 packages=fv gdbint
 
-[libs]
-libgcc=1
-
 [default]
 fpcdir=../..
 
@@ -39,11 +37,11 @@ endif
 endif
 
 # Compiler dir
-ifdef FAKE
-COMPILERDIR=../fake/compiler
-else
+#ifdef FAKE
+#COMPILERDIR=../fake/compiler
+#else
 COMPILERDIR=compiler
-endif
+#endif
 
 # when including debugger include the gdbinterface
 ifndef GDBINT
@@ -157,14 +155,14 @@ clean: cleanall
 #
 
 ifndef UNIXINSTALLDIR
-override DATAINSTALLDIR=$(BININSTALLDIR)
+override INSTALL_DATADIR=$(INSTALL_BINDIR)
 endif
 
 install: fpc_install
-        $(MKDIR) $(DATAINSTALLDIR)
-        $(MKDIR) $(DOCINSTALLDIR)
-        $(INSTALL) fp.ans $(wildcard *.pt) $(wildcard *.tdf) $(DATAINSTALLDIR)
-        $(INSTALL) readme.ide $(DOCINSTALLDIR)
+        $(MKDIR) $(INSTALL_DATADIR)
+        $(MKDIR) $(INSTALL_DOCDIR)
+        $(INSTALL) fp.ans $(wildcard *.pt) $(wildcard *.tdf) $(INSTALL_DATADIR)
+        $(INSTALL) readme.ide $(INSTALL_DOCDIR)
 
 
 #

ide/text/compiler/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -118,6 +118,7 @@ endif
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override TARGET_UNITS+=compunit
+override INSTALL_FPCPACKAGE=y
 override COMPILER_OPTIONS+=-Ca
 override COMPILER_INCLUDEDIR+=$(FPCDIR)/compiler $(FPCDIR)/compiler/$(CPU_TARGET)
 override COMPILER_UNITDIR+=$(FPCDIR)/compiler $(FPCDIR)/compiler/$(CPU_TARGET) $(FPCDIR)/compiler/targets
@@ -356,7 +357,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -366,56 +371,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -685,7 +715,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -722,7 +752,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -792,23 +822,24 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 debug: fpc_debug
 examples: fpc_examples
 smart: fpc_smart
 shared: fpc_shared
-install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
 distinstall: fpc_distinstall
@@ -819,7 +850,7 @@ zipdistinstall:
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall distclean cleanall info
+.PHONY: debug examples smart shared sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
@@ -829,3 +860,4 @@ override COMPILER+=-dSUPPORT_MMX
 endif
 all: fpc_all
 clean: cleanall
+install:

ide/text/compiler/Makefile.fpc

@@ -14,6 +14,9 @@ targetdir=.
 unitdir=$(FPCDIR)/compiler $(FPCDIR)/compiler/$(CPU_TARGET) $(FPCDIR)/compiler/targets
 includedir=$(FPCDIR)/compiler $(FPCDIR)/compiler/$(CPU_TARGET)
 
+[install]
+fpcpackage=y
+
 [default]
 fpcdir=../../..
 
@@ -26,3 +29,6 @@ endif
 all: fpc_all
 
 clean: cleanall
+
+# Nothing to install
+install:

install/demo/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -358,7 +358,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -368,56 +372,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -604,13 +633,13 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR
 ifndef inUnix
-PACKDIR=$(BASEDIR)/../pack_tmp/$(PACKAGE_NAME)
+PACKDIR=$(BASEDIR)/../fpc-pack
 else
-PACKDIR=/tmp/fpc-pack/$(PACKAGE_NAME)
+PACKDIR=/tmp/fpc-pack
 endif
 endif
 ifndef ZIPNAME
@@ -712,7 +741,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -782,17 +811,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 TARGET_DIRS_TEXT=1
 TARGET_DIRS_GRAPH=1

install/demo/graph/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -356,7 +356,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -366,56 +370,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -665,7 +694,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -702,7 +731,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -772,17 +801,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 debug: fpc_debug
 examples: fpc_examples

install/demo/linux/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -354,7 +354,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -364,56 +368,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -655,7 +684,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -692,7 +721,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -762,17 +791,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug

install/demo/modex/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -354,7 +354,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -364,56 +368,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -655,7 +684,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -692,7 +721,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -762,17 +791,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug

install/demo/os2/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -354,7 +354,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -364,56 +368,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -655,7 +684,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -692,7 +721,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -762,17 +791,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug

install/demo/text/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -352,7 +352,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -362,56 +366,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -653,7 +682,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -690,7 +719,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -760,17 +789,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug

install/demo/win32/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -354,7 +354,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -364,56 +368,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -655,7 +684,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -692,7 +721,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -762,17 +791,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug

install/fpinst/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,6 +138,7 @@ endif
 ifeq ($(OS_TARGET),linux)
 override CLEAN_FILES+=installer.pas
 endif
+override INSTALL_FPCPACKAGE=y
 override COMPILER_UNITDIR+=../ide/text
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
@@ -373,7 +374,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -383,56 +388,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -706,13 +736,13 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR
 ifndef inUnix
-PACKDIR=$(BASEDIR)/../pack_tmp/$(PACKAGE_NAME)
+PACKDIR=$(BASEDIR)/../fpc-pack
 else
-PACKDIR=/tmp/fpc-pack/$(PACKAGE_NAME)
+PACKDIR=/tmp/fpc-pack
 endif
 endif
 ifndef ZIPNAME
@@ -814,7 +844,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -884,17 +914,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug

install/fpinst/Makefile.fpc

@@ -23,6 +23,9 @@ packages=fv
 [compiler]
 unitdir=../ide/text
 
+[install]
+fpcpackage=y
+
 [default]
 fpcdir=..
 

packages/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -132,6 +132,7 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 override TARGET_DIRS+=zlib ncurses x11 gtk syslog inet uncgi mysql ibase postgres opengl forms svgalib ggi utmp paszlib gdbint cmem regexpr unzip
 endif
+override INSTALL_FPCPACKAGE=y
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -366,7 +367,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -376,56 +381,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -612,7 +642,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -649,7 +679,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -719,17 +749,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 ifeq ($(OS_TARGET),linux)
 TARGET_DIRS_ZLIB=1

packages/Makefile.fpc

@@ -17,5 +17,8 @@ dirs_freebsd=zlib ncurses x11 gtk syslog \
            opengl forms svgalib ggi \
            utmp paszlib gdbint cmem regexpr unzip
 
+[install]
+fpcpackage=y
+
 [default]
 fpcdir=..

packages/cmem/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -121,6 +121,7 @@ override PACKAGE_NAME=cmem
 override PACKAGE_VERSION=1.0.5
 override TARGET_UNITS+=cmem
 override TARGET_EXAMPLES+=testcmem
+override INSTALL_FPCPACKAGE=y
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -355,7 +356,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -365,56 +370,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -667,13 +697,13 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR
 ifndef inUnix
-PACKDIR=$(BASEDIR)/../pack_tmp/$(PACKAGE_NAME)
+PACKDIR=$(BASEDIR)/../fpc-pack
 else
-PACKDIR=/tmp/fpc-pack/$(PACKAGE_NAME)
+PACKDIR=/tmp/fpc-pack
 endif
 endif
 ifndef ZIPNAME
@@ -775,7 +805,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -845,17 +875,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug

packages/cmem/Makefile.fpc

@@ -10,5 +10,8 @@ version=1.0.5
 units=cmem
 examples=testcmem
 
+[install]
+fpcpackage=y
+
 [default]
 fpcdir=../..

packages/forms/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -122,6 +122,7 @@ override PACKAGE_VERSION=1.0.5
 override TARGET_PROGRAMS+=fd2pascal
 override TARGET_UNITS+=forms
 override TARGET_EXAMPLEDIRS+=demo
+override INSTALL_FPCPACKAGE=y
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -356,7 +357,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -366,56 +371,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -727,13 +757,13 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR
 ifndef inUnix
-PACKDIR=$(BASEDIR)/../pack_tmp/$(PACKAGE_NAME)
+PACKDIR=$(BASEDIR)/../fpc-pack
 else
-PACKDIR=/tmp/fpc-pack/$(PACKAGE_NAME)
+PACKDIR=/tmp/fpc-pack
 endif
 endif
 ifndef ZIPNAME
@@ -835,7 +865,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -905,17 +935,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 TARGET_EXAMPLEDIRS_DEMO=1
 ifdef TARGET_EXAMPLEDIRS_DEMO

packages/forms/Makefile.fpc

@@ -15,5 +15,8 @@ exampledirs=demo
 packages=x11
 libc=y
 
+[install]
+fpcpackage=y
+
 [default]
 fpcdir=../..

packages/forms/demo/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -118,6 +118,7 @@ endif
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override TARGET_PROGRAMS+=pushme yesno pushbutton touchbutton minput inputall choice butttypes colsel colsel1 buttonall chartall positioner secretinput cursor fdial ldial ndial invslider sliderall borderwidth boxtype xyplotover arrowbutton browserop browserall chartstrip colbrowser counter fbrowse1 fbrowse flclock fonts goodies lalign ll longlabel menu objinactive objpos newbutton multilabel objreturn
+override INSTALL_FPCPACKAGE=y
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -352,7 +353,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -362,56 +367,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -732,7 +762,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -769,7 +799,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -839,17 +869,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug

packages/forms/demo/Makefile.fpc

@@ -13,5 +13,8 @@ programs=pushme yesno pushbutton touchbutton minput inputall choice butttypes \
 [require]
 packages=forms
 
+[install]
+fpcpackage=y
+
 [default]
 fpcdir=../../..

packages/gdbint/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -121,6 +121,7 @@ override PACKAGE_NAME=gdbint
 override PACKAGE_VERSION=1.0.5
 override TARGET_UNITS+=gdbint gdbcon
 override TARGET_EXAMPLES+=testgdb symify
+override INSTALL_FPCPACKAGE=y
 override COMPILER_OBJECTDIR+=libgdb/$(OS_TARGET)
 override COMPILER_LIBRARYDIR+=libgdb/$(OS_TARGET)
 ifndef ECHO
@@ -357,7 +358,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -367,56 +372,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -684,13 +714,13 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR
 ifndef inUnix
-PACKDIR=$(BASEDIR)/../pack_tmp/$(PACKAGE_NAME)
+PACKDIR=$(BASEDIR)/../fpc-pack
 else
-PACKDIR=/tmp/fpc-pack/$(PACKAGE_NAME)
+PACKDIR=/tmp/fpc-pack
 endif
 endif
 ifndef ZIPNAME
@@ -792,7 +822,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -862,17 +892,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug

packages/gdbint/Makefile.fpc

@@ -17,6 +17,9 @@ librarydir=libgdb/$(OS_TARGET)
 [require]
 libc=y
 
+[install]
+fpcpackage=y
+
 [default]
 fpcdir=../..
 

packages/gdbint/libgdb/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -343,7 +343,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -353,56 +357,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -589,7 +618,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -626,7 +655,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -696,17 +725,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 debug: fpc_debug
 examples: fpc_examples

packages/gdbm/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -109,6 +109,7 @@ endif
 endif
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+override INSTALL_FPCPACKAGE=y
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -343,7 +344,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -353,56 +358,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -589,7 +619,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -626,7 +656,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -696,17 +726,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug

packages/gdbm/Makefile.fpc

@@ -12,6 +12,9 @@ examplesubdir=gdbm
 [dirs]
 fpcdir=../..
 
+[install]
+fpcpackage=y
+
 [rules]
 testgdbm$(EXEEXT): testgdbm.pp gdbm$(PPUEXT)
 

packages/ggi/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -121,6 +121,7 @@ override PACKAGE_NAME=ggi
 override PACKAGE_VERSION=1.0.5
 override TARGET_UNITS+=gii ggi ggi2d
 override TARGET_EXAMPLES+=ggi1
+override INSTALL_FPCPACKAGE=y
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -355,7 +356,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -365,56 +370,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -682,13 +712,13 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR
 ifndef inUnix
-PACKDIR=$(BASEDIR)/../pack_tmp/$(PACKAGE_NAME)
+PACKDIR=$(BASEDIR)/../fpc-pack
 else
-PACKDIR=/tmp/fpc-pack/$(PACKAGE_NAME)
+PACKDIR=/tmp/fpc-pack
 endif
 endif
 ifndef ZIPNAME
@@ -790,7 +820,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -860,17 +890,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug

packages/ggi/Makefile.fpc

@@ -13,5 +13,8 @@ examples=ggi1
 [require]
 libc=y
 
+[install]
+fpcpackage=y
+
 [default]
 fpcdir=../..

packages/gtk/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -122,6 +122,7 @@ override PACKAGE_VERSION=1.0.5
 override TARGET_DIRS+=gtkgl
 override TARGET_UNITS+=glib gmodule gdk gtk
 override TARGET_EXAMPLEDIRS+=examples
+override INSTALL_FPCPACKAGE=y
 override COMPILER_SOURCEDIR+=glib gdk gtk
 override COMPILER_TARGETDIR+=.
 ifndef ECHO
@@ -358,7 +359,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -368,56 +373,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -745,13 +775,13 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR
 ifndef inUnix
-PACKDIR=$(BASEDIR)/../pack_tmp/$(PACKAGE_NAME)
+PACKDIR=$(BASEDIR)/../fpc-pack
 else
-PACKDIR=/tmp/fpc-pack/$(PACKAGE_NAME)
+PACKDIR=/tmp/fpc-pack
 endif
 endif
 ifndef ZIPNAME
@@ -853,7 +883,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -923,17 +953,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 TARGET_DIRS_GTKGL=1
 ifdef TARGET_DIRS_GTKGL

packages/gtk/Makefile.fpc

@@ -22,6 +22,9 @@ targetdir=.
 libname=libfpgtk.so
 libversion=1.0
 
+[install]
+fpcpackage=y
+
 [default]
 fpcdir=../..
 

packages/gtk/examples/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -120,6 +120,7 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override TARGET_DIRS+=tutorial
 override TARGET_PROGRAMS+=entry notebook scribble clist ttt_test pixmap list progressbar filesel
 override CLEAN_UNITS+=tictactoe
+override INSTALL_FPCPACKAGE=y
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -354,7 +355,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -364,56 +369,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -762,7 +792,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -799,7 +829,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -869,17 +899,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 TARGET_DIRS_TUTORIAL=1
 ifdef TARGET_DIRS_TUTORIAL

packages/gtk/examples/Makefile.fpc

@@ -12,5 +12,8 @@ packages=gtk
 [clean]
 units=tictactoe
 
+[install]
+fpcpackage=y
+
 [default]
 fpcdir=../../..

packages/gtk/examples/tutorial/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -117,6 +117,7 @@ endif
 endif
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+override INSTALL_FPCPACKAGE=y
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -351,7 +352,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -361,56 +366,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -715,7 +745,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -752,7 +782,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -822,17 +852,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug

packages/gtk/examples/tutorial/Makefile.fpc

@@ -8,5 +8,8 @@ programs=$(subst .pp,,$(wildcard tut*.pp))
 [require]
 packages=gtk
 
+[install]
+fpcpackage=y
+
 [default]
 fpcdir=../../../..

packages/gtk/gtkgl/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -120,6 +120,7 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=gtk
 override TARGET_UNITS+=gtkglarea
 override TARGET_EXAMPLES+=gtkgldemo
+override INSTALL_FPCPACKAGE=y
 override COMPILER_TARGETDIR+=..
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
@@ -355,7 +356,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -365,56 +370,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -742,7 +772,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -779,7 +809,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -849,17 +879,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug

packages/gtk/gtkgl/Makefile.fpc

@@ -15,5 +15,8 @@ packages=opengl
 [compiler]
 targetdir=..
 
+[install]
+fpcpackage=y
+
 [default]
 fpcdir=../../..

packages/ibase/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -121,6 +121,7 @@ override PACKAGE_NAME=ibase
 override PACKAGE_VERSION=1.0.5
 override TARGET_UNITS+=ibase40 ibase60
 override TARGET_EXAMPLES+=testib40 testib60
+override INSTALL_FPCPACKAGE=y
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -355,7 +356,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -365,56 +370,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -682,13 +712,13 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR
 ifndef inUnix
-PACKDIR=$(BASEDIR)/../pack_tmp/$(PACKAGE_NAME)
+PACKDIR=$(BASEDIR)/../fpc-pack
 else
-PACKDIR=/tmp/fpc-pack/$(PACKAGE_NAME)
+PACKDIR=/tmp/fpc-pack
 endif
 endif
 ifndef ZIPNAME
@@ -790,7 +820,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -860,17 +890,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug

packages/ibase/Makefile.fpc

@@ -13,5 +13,8 @@ examples=testib40 testib60
 [require]
 libc=y
 
+[install]
+fpcpackage=y
+
 [default]
 fpcdir=../..

packages/inet/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -121,6 +121,7 @@ override PACKAGE_NAME=inet
 override PACKAGE_VERSION=1.0.5
 override TARGET_UNITS+=inet
 override TARGET_EXAMPLES+=testinet pfinger
+override INSTALL_FPCPACKAGE=y
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -355,7 +356,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -365,56 +370,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -667,13 +697,13 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR
 ifndef inUnix
-PACKDIR=$(BASEDIR)/../pack_tmp/$(PACKAGE_NAME)
+PACKDIR=$(BASEDIR)/../fpc-pack
 else
-PACKDIR=/tmp/fpc-pack/$(PACKAGE_NAME)
+PACKDIR=/tmp/fpc-pack
 endif
 endif
 ifndef ZIPNAME
@@ -775,7 +805,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -845,17 +875,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug

packages/inet/Makefile.fpc

@@ -10,5 +10,8 @@ version=1.0.5
 units=inet
 examples=testinet pfinger
 
+[install]
+fpcpackage=y
+
 [default]
 fpcdir=../..

packages/libgd/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -121,6 +121,7 @@ override PACKAGE_NAME=libgd
 override PACKAGE_VERSION=1.0.5
 override TARGET_UNITS+=gd
 override TARGET_EXAMPLES+=gdtest
+override INSTALL_FPCPACKAGE=y
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -355,7 +356,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -365,56 +370,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -682,13 +712,13 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR
 ifndef inUnix
-PACKDIR=$(BASEDIR)/../pack_tmp/$(PACKAGE_NAME)
+PACKDIR=$(BASEDIR)/../fpc-pack
 else
-PACKDIR=/tmp/fpc-pack/$(PACKAGE_NAME)
+PACKDIR=/tmp/fpc-pack
 endif
 endif
 ifndef ZIPNAME
@@ -790,7 +820,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -860,17 +890,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug

packages/libgd/Makefile.fpc

@@ -13,5 +13,8 @@ libc=y
 units=gd
 examples=gdtest
 
+[install]
+fpcpackage=y
+
 [default]
 fpcdir=../..

packages/libpng/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -120,6 +120,7 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=libpng
 override PACKAGE_VERSION=1.0.5
 override TARGET_UNITS+=png
+override INSTALL_FPCPACKAGE=y
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -354,7 +355,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -364,56 +369,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -698,13 +728,13 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR
 ifndef inUnix
-PACKDIR=$(BASEDIR)/../pack_tmp/$(PACKAGE_NAME)
+PACKDIR=$(BASEDIR)/../fpc-pack
 else
-PACKDIR=/tmp/fpc-pack/$(PACKAGE_NAME)
+PACKDIR=/tmp/fpc-pack
 endif
 endif
 ifndef ZIPNAME
@@ -806,7 +836,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -876,17 +906,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug

packages/libpng/Makefile.fpc

@@ -13,5 +13,8 @@ libc=y
 [target]
 units=png
 
+[install]
+fpcpackage=y
+
 [default]
 fpcdir=../..

packages/mysql/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -121,6 +121,7 @@ override PACKAGE_NAME=mysql
 override PACKAGE_VERSION=1.0.5
 override TARGET_UNITS+=mysql_com mysql_version mysql
 override TARGET_EXAMPLES+=testdb
+override INSTALL_FPCPACKAGE=y
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -355,7 +356,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -365,56 +370,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -682,13 +712,13 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR
 ifndef inUnix
-PACKDIR=$(BASEDIR)/../pack_tmp/$(PACKAGE_NAME)
+PACKDIR=$(BASEDIR)/../fpc-pack
 else
-PACKDIR=/tmp/fpc-pack/$(PACKAGE_NAME)
+PACKDIR=/tmp/fpc-pack
 endif
 endif
 ifndef ZIPNAME
@@ -790,7 +820,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -860,17 +890,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug

packages/mysql/Makefile.fpc

@@ -13,5 +13,8 @@ examples=testdb
 [require]
 libc=y
 
+[install]
+fpcpackage=y
+
 [default]
 fpcdir=../..

packages/ncurses/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -121,6 +121,7 @@ override PACKAGE_NAME=ncurses
 override PACKAGE_VERSION=1.0.5
 override TARGET_UNITS+=ncurses panel ncrt ocrt menu
 override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo
+override INSTALL_FPCPACKAGE=y
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -355,7 +356,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -365,56 +370,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -682,13 +712,13 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR
 ifndef inUnix
-PACKDIR=$(BASEDIR)/../pack_tmp/$(PACKAGE_NAME)
+PACKDIR=$(BASEDIR)/../fpc-pack
 else
-PACKDIR=/tmp/fpc-pack/$(PACKAGE_NAME)
+PACKDIR=/tmp/fpc-pack
 endif
 endif
 ifndef ZIPNAME
@@ -790,7 +820,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -860,17 +890,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug

packages/ncurses/Makefile.fpc

@@ -13,5 +13,8 @@ examples=firework testn ocrt_demo edit_demo db_demo screen_demo
 [require]
 libc=y
 
+[install]
+fpcpackage=y
+
 [default]
 fpcdir=../..

packages/opengl/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -127,6 +127,7 @@ ifeq ($(OS_TARGET),win32)
 override TARGET_UNITS+=glaux gl_sl glut_sl glaux_sl
 endif
 override TARGET_EXAMPLEDIRS+=examples
+override INSTALL_FPCPACKAGE=y
 override COMPILER_SOURCEDIR+=$(OS_TARGET)
 override COMPILER_TARGETDIR+=$(OS_TARGET)
 ifndef ECHO
@@ -363,7 +364,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -373,56 +378,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -718,13 +748,13 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR
 ifndef inUnix
-PACKDIR=$(BASEDIR)/../pack_tmp/$(PACKAGE_NAME)
+PACKDIR=$(BASEDIR)/../fpc-pack
 else
-PACKDIR=/tmp/fpc-pack/$(PACKAGE_NAME)
+PACKDIR=/tmp/fpc-pack
 endif
 endif
 ifndef ZIPNAME
@@ -826,7 +856,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -896,17 +926,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 TARGET_EXAMPLEDIRS_EXAMPLES=1
 ifdef TARGET_EXAMPLEDIRS_EXAMPLES

packages/opengl/Makefile.fpc

@@ -20,5 +20,8 @@ exampledirs=examples
 sourcedir=$(OS_TARGET)
 targetdir=$(OS_TARGET)
 
+[install]
+fpcpackage=y
+
 [default]
 fpcdir=../..

packages/opengl/build/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all_units
 override PATH:=$(subst \,/,$(PATH))
@@ -91,6 +91,14 @@ else
 override FPCDIR=wrong
 endif
 ifeq ($(FPCDIR),wrong)
+override FPCDIR=../../..
+ifeq ($(wildcard $(FPCDIR)/rtl),)
+ifeq ($(wildcard $(FPCDIR)/units),)
+override FPCDIR=wrong
+endif
+endif
+endif
+ifeq ($(FPCDIR),wrong)
 ifdef inUnix
 override FPCDIR=/usr/local/lib/fpc/$(FPC_VERSION)
 ifeq ($(wildcard $(FPCDIR)/units),)
@@ -111,6 +119,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override TARGET_PROGRAMS+=c_gen
 override TARGET_UNITS+=buildgl
+override INSTALL_FPCPACKAGE=y
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -345,7 +354,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -355,56 +368,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -819,7 +857,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -856,7 +894,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -926,17 +964,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug

packages/opengl/build/Makefile.fpc

@@ -12,6 +12,11 @@ packages=fcl
 [default]
 rule=all_units
 
+[install]
+fpcpackage=y
+
+[default]
+fpcdir=../../..
 
 [rules]
 .PHONY: all_units linux win32 w32d w32s

packages/opengl/examples/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -91,6 +91,14 @@ else
 override FPCDIR=wrong
 endif
 ifeq ($(FPCDIR),wrong)
+override FPCDIR=../../..
+ifeq ($(wildcard $(FPCDIR)/rtl),)
+ifeq ($(wildcard $(FPCDIR)/units),)
+override FPCDIR=wrong
+endif
+endif
+endif
+ifeq ($(FPCDIR),wrong)
 ifdef inUnix
 override FPCDIR=/usr/local/lib/fpc/$(FPC_VERSION)
 ifeq ($(wildcard $(FPCDIR)/units),)
@@ -110,6 +118,7 @@ endif
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override TARGET_PROGRAMS+=glutdemo morph3d bounce
+override INSTALL_FPCPACKAGE=y
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -344,7 +353,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -354,56 +367,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -720,7 +758,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -757,7 +795,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -827,17 +865,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug

packages/opengl/examples/Makefile.fpc

@@ -7,3 +7,11 @@ programs=glutdemo morph3d bounce
 
 [require]
 packages=opengl
+
+[install]
+fpcpackage=y
+
+[default]
+fpcdir=../../..
+
+

packages/oracle/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -121,6 +121,7 @@ override PACKAGE_NAME=oracle
 override PACKAGE_VERSION=1.0.5
 override TARGET_UNITS+=oraoci
 override TARGET_EXAMPLEDIRS+=example
+override INSTALL_FPCPACKAGE=y
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -355,7 +356,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -365,56 +370,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -682,13 +712,13 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR
 ifndef inUnix
-PACKDIR=$(BASEDIR)/../pack_tmp/$(PACKAGE_NAME)
+PACKDIR=$(BASEDIR)/../fpc-pack
 else
-PACKDIR=/tmp/fpc-pack/$(PACKAGE_NAME)
+PACKDIR=/tmp/fpc-pack
 endif
 endif
 ifndef ZIPNAME
@@ -790,7 +820,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -860,17 +890,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 TARGET_EXAMPLEDIRS_EXAMPLE=1
 ifdef TARGET_EXAMPLEDIRS_EXAMPLE

packages/oracle/Makefile.fpc

@@ -13,6 +13,9 @@ exampledirs=example
 [require]
 libc=y
 
+[install]
+fpcpackage=y
+
 [default]
 fpcdir=../..
 

packages/oracle/example/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -119,6 +119,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override TARGET_UNITS+=oraclew
 override TARGET_EXAMPLES+=test01
+override INSTALL_FPCPACKAGE=y
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -353,7 +354,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -363,56 +368,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -862,7 +892,7 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@@ -899,7 +929,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -969,17 +999,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug

packages/oracle/example/Makefile.fpc

@@ -9,6 +9,9 @@ examples=test01
 [require]
 packages=oracle fcl
 
+[install]
+fpcpackage=y
+
 [default]
 fpcdir=../../..
 

packages/paszlib/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -121,6 +121,7 @@ override PACKAGE_NAME=paszlib
 override PACKAGE_VERSION=1.0.5
 override TARGET_UNITS+=paszlib adler gzcrc gzcrcasm gzio infblock infcodes inffast inftrees infutil strutils trees zcompres zdeflate zinflate zbase zuncompr zutil
 override TARGET_EXAMPLES+=example minigzip
+override INSTALL_FPCPACKAGE=y
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -355,7 +356,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -365,56 +370,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -667,13 +697,13 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR
 ifndef inUnix
-PACKDIR=$(BASEDIR)/../pack_tmp/$(PACKAGE_NAME)
+PACKDIR=$(BASEDIR)/../fpc-pack
 else
-PACKDIR=/tmp/fpc-pack/$(PACKAGE_NAME)
+PACKDIR=/tmp/fpc-pack
 endif
 endif
 ifndef ZIPNAME
@@ -775,7 +805,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -845,17 +875,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug

packages/paszlib/Makefile.fpc

@@ -10,5 +10,8 @@ version=1.0.5
 units=paszlib adler gzcrc gzcrcasm gzio infblock infcodes inffast inftrees infutil strutils trees zcompres zdeflate zinflate zbase zuncompr zutil
 examples=example minigzip
 
+[install]
+fpcpackage=y
+
 [default]
 fpcdir=../..

packages/postgres/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -121,6 +121,7 @@ override PACKAGE_NAME=postgres
 override PACKAGE_VERSION=1.0.5
 override TARGET_UNITS+=dllist postgres
 override TARGET_EXAMPLES+=testpg1 testpg2
+override INSTALL_FPCPACKAGE=y
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -355,7 +356,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -365,56 +370,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -682,13 +712,13 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR
 ifndef inUnix
-PACKDIR=$(BASEDIR)/../pack_tmp/$(PACKAGE_NAME)
+PACKDIR=$(BASEDIR)/../fpc-pack
 else
-PACKDIR=/tmp/fpc-pack/$(PACKAGE_NAME)
+PACKDIR=/tmp/fpc-pack
 endif
 endif
 ifndef ZIPNAME
@@ -790,7 +820,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -860,17 +890,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug

packages/postgres/Makefile.fpc

@@ -13,5 +13,8 @@ examples=testpg1 testpg2
 [require]
 libc=y
 
+[install]
+fpcpackage=y
+
 [default]
 fpcdir=../..

packages/postgres/postgres.pp

@@ -7,8 +7,8 @@ uses dllist;
 {$linklib pq}
 {$linklib c}
 
-{ Not always needed. If you have problems linking, try to remove this  }
-{$linklib crypt}
+{ Not always needed. If you have problems linking, try to add this  }
+{ $linklib crypt}
 
 { $include "libpq/pqcomm.h"}
 
@@ -328,7 +328,10 @@ end;
 {$endif}
 
 end.  $Log$
-end.  Revision 1.2  2000-07-13 11:33:30  michael
+end.  Revision 1.3  2001-05-03 21:35:09  peter
+end.    * Makefile fixes
+end.
+end.  Revision 1.2  2000/07/13 11:33:30  michael
 end.  + removed logs
 end. 
 }

packages/regexpr/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -121,6 +121,7 @@ override PACKAGE_NAME=regexpr
 override PACKAGE_VERSION=1.0.5
 override TARGET_UNITS+=regexpr
 override TARGET_EXAMPLES+=testreg1
+override INSTALL_FPCPACKAGE=y
 override COMPILER_OPTIONS+=-S2
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
@@ -356,7 +357,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -366,56 +371,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -668,13 +698,13 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR
 ifndef inUnix
-PACKDIR=$(BASEDIR)/../pack_tmp/$(PACKAGE_NAME)
+PACKDIR=$(BASEDIR)/../fpc-pack
 else
-PACKDIR=/tmp/fpc-pack/$(PACKAGE_NAME)
+PACKDIR=/tmp/fpc-pack
 endif
 endif
 ifndef ZIPNAME
@@ -776,7 +806,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -846,17 +876,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug

packages/regexpr/Makefile.fpc

@@ -13,5 +13,8 @@ examples=testreg1
 [compiler]
 options=-S2
 
+[install]
+fpcpackage=y
+
 [default]
 fpcdir=../..

packages/svgalib/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -121,6 +121,7 @@ override PACKAGE_NAME=svgalib
 override PACKAGE_VERSION=1.0.5
 override TARGET_UNITS+=svgalib vgamouse
 override TARGET_EXAMPLES+=testvga vgatest
+override INSTALL_FPCPACKAGE=y
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -355,7 +356,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -365,56 +370,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -682,13 +712,13 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR
 ifndef inUnix
-PACKDIR=$(BASEDIR)/../pack_tmp/$(PACKAGE_NAME)
+PACKDIR=$(BASEDIR)/../fpc-pack
 else
-PACKDIR=/tmp/fpc-pack/$(PACKAGE_NAME)
+PACKDIR=/tmp/fpc-pack
 endif
 endif
 ifndef ZIPNAME
@@ -790,7 +820,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -860,17 +890,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug

packages/svgalib/Makefile.fpc

@@ -13,5 +13,8 @@ examples=testvga vgatest
 [require]
 libc=y
 
+[install]
+fpcpackage=y
+
 [default]
 fpcdir=../..

packages/syslog/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -121,6 +121,7 @@ override PACKAGE_NAME=syslog
 override PACKAGE_VERSION=1.0.5
 override TARGET_UNITS+=systemlog
 override TARGET_EXAMPLES+=testlog
+override INSTALL_FPCPACKAGE=y
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -355,7 +356,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -365,56 +370,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -682,13 +712,13 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR
 ifndef inUnix
-PACKDIR=$(BASEDIR)/../pack_tmp/$(PACKAGE_NAME)
+PACKDIR=$(BASEDIR)/../fpc-pack
 else
-PACKDIR=/tmp/fpc-pack/$(PACKAGE_NAME)
+PACKDIR=/tmp/fpc-pack
 endif
 endif
 ifndef ZIPNAME
@@ -790,7 +820,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -860,17 +890,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug

packages/syslog/Makefile.fpc

@@ -13,5 +13,8 @@ examples=testlog
 [require]
 libc=y
 
+[install]
+fpcpackage=y
+
 [default]
 fpcdir=../..

packages/uncgi/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/04/25]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -121,6 +121,7 @@ override PACKAGE_NAME=uncgi
 override PACKAGE_VERSION=1.0.5
 override TARGET_UNITS+=uncgi
 override TARGET_EXAMPLES+=testcgi
+override INSTALL_FPCPACKAGE=y
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -355,7 +356,11 @@ ifndef INSTALL_PREFIX
 ifdef UNIXINSTALLDIR
 INSTALL_PREFIX=/usr/local
 else
-INSTALL_PREFIX=/pp
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
 endif
 endif
 export INSTALL_PREFIX
@@ -365,56 +370,81 @@ endif
 export DIST_DESTDIR
 ifndef INSTALL_BASEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
 else
-INSTALL_BASEDIR=$(INSTALL_PREFIX)
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
 endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-INSTALL_BINDIR=$(INSTALL_PREFIX)/bin
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
 else
-INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
+endif
 endif
 endif
 ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
-ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
+ifdef INSTALL_FPCPACKAGE
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_LIBDIR
 ifdef UNIXINSTALLDIR
-INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
 else
-INSTALL_LIBDIR=$(INSTALL_UNITDIR)
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
 endif
 endif
 ifndef INSTALL_SOURCEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
 endif
-ifdef PACKAGE_NAME
-INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)
 endif
 endif
 ifndef INSTALL_DOCDIR
 ifdef UNIXINSTALLDIR
-INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
-INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
 endif
 endif
 ifndef INSTALL_EXAMPLEDIR
 ifdef UNIXINSTALLDIR
-INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
 else
-INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
 endif
-ifdef EXAMPLESUBDIR
-INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)
 endif
 endif
 ifndef INSTALL_DATADIR
@@ -667,13 +697,13 @@ endif
 ifdef TARGET_EXAMPLEDIRS
 	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
 endif
-fpc_distinstall: fpc_install fpc_exampleinstall
+fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR
 ifndef inUnix
-PACKDIR=$(BASEDIR)/../pack_tmp/$(PACKAGE_NAME)
+PACKDIR=$(BASEDIR)/../fpc-pack
 else
-PACKDIR=/tmp/fpc-pack/$(PACKAGE_NAME)
+PACKDIR=/tmp/fpc-pack
 endif
 endif
 ifndef ZIPNAME
@@ -775,7 +805,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-fpc_distclean: fpc_clean
+fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
 endif
@@ -845,17 +875,19 @@ fpc_info:
 	@$(ECHO)  DateStr.............. $(DATESTR)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
-	@$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)
-	@$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)
-	@$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)
-	@$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)
-	@$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)
-	@$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
 	@$(ECHO)
-	@$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)
-	@$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug