* Allow GDBLIBDIR environment variable

packages/base/gdbint/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/08/01]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/08/24]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx
@@ -204,8 +204,8 @@ override PACKAGE_VERSION=1.0.6
 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)
+override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
+override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 endif
@@ -1332,13 +1332,18 @@ CURRDIR=./
 else
 CURRDIR=
 endif
-GDBLIBDIR+=libgdb/$(OS_TARGET)
+ifdef GDBLIBDIR
+override LIBGDB:=$(firstword $(wildcard $(addsuffix /libgdb.a,$(GDBLIBDIR))))
+endif
+ifeq ($(LIBGDB),)
+override GDBLIBDIR=libgdb/$(OS_TARGET)
 ifeq ($(OS_TARGET),go32v2)
 ifneq ($(DJDIR),)
 GDBLIBDIR+=$(DJDIR)/lib
 endif
 endif
 override LIBGDB:=$(firstword $(wildcard $(addsuffix /libgdb.a,$(GDBLIBDIR))))
+endif
 ifeq ($(LIBGDB),)
 GDBFOUND=0
 else

packages/base/gdbint/Makefile.fpc

@@ -11,8 +11,8 @@ units=gdbint gdbcon
 examples=testgdb symify
 
 [compiler]
-objectdir=libgdb/$(OS_TARGET)
-librarydir=libgdb/$(OS_TARGET)
+objectdir=$(GDBLIBDIR)
+librarydir=$(GDBLIBDIR)
 
 [require]
 libc=y
@@ -32,7 +32,14 @@ else
 CURRDIR=
 endif
 
-GDBLIBDIR+=libgdb/$(OS_TARGET)
+# Look for a valid GDBLIBDIR environment variable
+ifdef GDBLIBDIR
+override LIBGDB:=$(firstword $(wildcard $(addsuffix /libgdb.a,$(GDBLIBDIR))))
+endif
+
+# Use default dirs if not available
+ifeq ($(LIBGDB),)
+override GDBLIBDIR=libgdb/$(OS_TARGET)
 ifeq ($(OS_TARGET),go32v2)
 ifneq ($(DJDIR),)
 GDBLIBDIR+=$(DJDIR)/lib
@@ -40,6 +47,9 @@ endif
 endif
 # Detect if libgdb.a is available
 override LIBGDB:=$(firstword $(wildcard $(addsuffix /libgdb.a,$(GDBLIBDIR))))
+endif
+
+# Set GDBFOUND variable
 ifeq ($(LIBGDB),)
 GDBFOUND=0
 else