From f0d43c9f1ceabc778f193d73adff2984cfb139c2 Mon Sep 17 00:00:00 2001 From: peter Date: Wed, 11 Oct 2000 09:39:56 +0000 Subject: [PATCH] * fp.ans installing (merged) --- ide/text/Makefile | 34 ++++++++++++++++++++++++++++++---- ide/text/Makefile.fpc | 34 ++++++++++++++++++++++++++++++---- 2 files changed, 60 insertions(+), 8 deletions(-) diff --git a/ide/text/Makefile b/ide/text/Makefile index 790a1438d4..cc0a26d2e8 100644 --- a/ide/text/Makefile +++ b/ide/text/Makefile @@ -230,8 +230,12 @@ ifneq ($(DJDIR),) GDBLIBDIR+=$(DJDIR)/lib endif endif -ifeq ($(wildcard $(addsuffix /libgdb.a,$(GDBLIBDIR))),) +ifeq ($(strip $(wildcard $(addsuffix /libgdb.a,$(GDBLIBDIR)))),) override GDB=0 +GDBFOUND=0 +else +override LIBGDB=$(firstword $(wildcard $(addsuffix /libgdb.a,$(GDBLIBDIR)))) +GDBFOUND=1 endif endif @@ -1404,14 +1408,29 @@ distclean: clean fp$(EXEEXT): $(wildcard *.pas) $(wildcard *.inc) +testgdb: +ifneq ($(GDBFOUND),0) + $(ECHO) LibGDB found in $(LIBGDB) +else + $(ECHO) LibGDB not found + $(ECHO) LIBGDB=$(LIBGDB) + $(ECHO) GDBLIBDIR=$(GDBLIBDIR) + $(ECHO) $(wildcard $(addsuffix /libgdb.a,$(GDBLIBDIR))) +endif + +postgdbinfo: +ifeq ($(GDBFOUND),0) + $(ECHO) LibGDB was not found, IDE has no Debugger support +endif + gdb: - $(MAKE) all GDB=1 + $(MAKE) testgdb all GDB=1 postgdbinfo full: $(MAKE) all FULL=1 fullgdb: - $(MAKE) all FULL=1 GDB=1 + $(MAKE) testgdb all FULL=1 GDB=1 postgdbinfo # This is necessary because we don't have all units separate in the # units targets @@ -1421,9 +1440,16 @@ clean: fpc_cleanall # Installation # +ifndef UNIXINSTALLDIR +override DATAINSTALLDIR=$(BININSTALLDIR) +endif + install: fpc_install $(MKDIR) $(DATAINSTALLDIR) - $(INSTALL) $(wildcard *.pt) $(wildcard *.tdf) readme.txt $(DATAINSTALLDIR) + $(MKDIR) $(DOCINSTALLDIR) + $(INSTALL) fp.ans $(wildcard *.pt) $(wildcard *.tdf) $(DATAINSTALLDIR) + $(INSTALL) readme.ide $(DOCINSTALLDIR) + # # Misc diff --git a/ide/text/Makefile.fpc b/ide/text/Makefile.fpc index 908e9a597a..6f0536042e 100644 --- a/ide/text/Makefile.fpc +++ b/ide/text/Makefile.fpc @@ -41,8 +41,12 @@ ifneq ($(DJDIR),) GDBLIBDIR+=$(DJDIR)/lib endif endif -ifeq ($(wildcard $(addsuffix /libgdb.a,$(GDBLIBDIR))),) +ifeq ($(strip $(wildcard $(addsuffix /libgdb.a,$(GDBLIBDIR)))),) override GDB=0 +GDBFOUND=0 +else +override LIBGDB=$(firstword $(wildcard $(addsuffix /libgdb.a,$(GDBLIBDIR)))) +GDBFOUND=1 endif endif @@ -71,14 +75,29 @@ distclean: clean fp$(EXEEXT): $(wildcard *.pas) $(wildcard *.inc) +testgdb: +ifneq ($(GDBFOUND),0) + $(ECHO) LibGDB found in $(LIBGDB) +else + $(ECHO) LibGDB not found + $(ECHO) LIBGDB=$(LIBGDB) + $(ECHO) GDBLIBDIR=$(GDBLIBDIR) + $(ECHO) $(wildcard $(addsuffix /libgdb.a,$(GDBLIBDIR))) +endif + +postgdbinfo: +ifeq ($(GDBFOUND),0) + $(ECHO) LibGDB was not found, IDE has no Debugger support +endif + gdb: - $(MAKE) all GDB=1 + $(MAKE) testgdb all GDB=1 postgdbinfo full: $(MAKE) all FULL=1 fullgdb: - $(MAKE) all FULL=1 GDB=1 + $(MAKE) testgdb all FULL=1 GDB=1 postgdbinfo # This is necessary because we don't have all units separate in the # units targets @@ -88,9 +107,16 @@ clean: fpc_cleanall # Installation # +ifndef UNIXINSTALLDIR +override DATAINSTALLDIR=$(BININSTALLDIR) +endif + install: fpc_install $(MKDIR) $(DATAINSTALLDIR) - $(INSTALL) $(wildcard *.pt) $(wildcard *.tdf) readme.txt $(DATAINSTALLDIR) + $(MKDIR) $(DOCINSTALLDIR) + $(INSTALL) fp.ans $(wildcard *.pt) $(wildcard *.tdf) $(DATAINSTALLDIR) + $(INSTALL) readme.ide $(DOCINSTALLDIR) + # # Misc