* Makefile fixes

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]