From e71bc5c6c34caeb5bc0ac6f546c59a2fe5433b21 Mon Sep 17 00:00:00 2001
From: peter <peter@freepascal.org>
Date: Mon, 17 Sep 2001 21:26:12 +0000
Subject: [PATCH]   * short commandline

---
 ide/Makefile     | 9 ++++++---
 ide/Makefile.fpc | 3 ---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ide/Makefile b/ide/Makefile
index 559e4af62b..6820b34561 100644
--- a/ide/Makefile
+++ b/ide/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/09/13]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/09/17]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -178,11 +178,9 @@ endif
 endif
 ifeq ($(GDB),1)
 override LIBDIR+=$(GDBLIBDIR)
-override OBJDIR+=$(GDBOBJDIR)
 else
 override UNITDIR+=fakegdb
 endif
-override UNITDIR+=$(PACKAGESDIR)/regexpr
 override TARGET_DIRS+=compiler fakegdb
 override TARGET_PROGRAMS+=fp
 override INSTALL_DATADIR=$(INSTALL_BASEDIR)/ide
@@ -596,9 +594,14 @@ ifdef inUnix
 ifndef GCCLIBDIR
 GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`)
 endif
+ifeq ($(OS_TARGET),linux)
 ifndef OTHERLIBDIR
 OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }')
 endif
+endif
+ifeq ($(OS_TARGET),netbsd)
+OTHERLIBDIR+=/usr/pkg/lib
+endif
 export GCCLIBDIR OTHERLIB
 endif
 ifeq ($(OS_TARGET),linux)
diff --git a/ide/Makefile.fpc b/ide/Makefile.fpc
index 30237a4d2f..f0aa334eda 100644
--- a/ide/Makefile.fpc
+++ b/ide/Makefile.fpc
@@ -96,13 +96,10 @@ endif
 ifeq ($(GDB),1)
 # The gdbint is already included due the gdbint package dependency
 override LIBDIR+=$(GDBLIBDIR)
-override OBJDIR+=$(GDBOBJDIR)
 else
 override UNITDIR+=fakegdb
 endif
 
-override UNITDIR+=$(PACKAGESDIR)/regexpr
-
 [rules]
 .PHONY: compilerunits compilerclean \
         nogdb gdb all \