*** core/make/target.make.orig	Thu Jun 19 13:12:45 2003
--- core/make/target.make	Mon Jun 23 13:04:14 2003
***************
*** 90,96 ****
    endif
  endif
  ifeq ($(findstring netbsd, $(GNUSTEP_TARGET_OS)), netbsd)
! TARGET_SYSTEM_LIBS := $(CONFIG_SYSTEM_LIBS) -lm
  endif
  ifeq ($(findstring openbsd, $(GNUSTEP_TARGET_OS)), openbsd)
  TARGET_SYSTEM_LIBS := $(CONFIG_SYSTEM_LIBS) -lm
--- 90,101 ----
    endif
  endif
  ifeq ($(findstring netbsd, $(GNUSTEP_TARGET_OS)), netbsd)
!   TARGET_SYSTEM_LIBS := $(CONFIG_SYSTEM_LIBS) -lm
!   ifneq ("$(objc_threaded)","")
!     INTERNAL_CFLAGS = -D_REENTRANT
!     INTERNAL_OBJCFLAGS = -D_REENTRANT
!     AUXILIARY_OBJC_LIBS += $(objc_threaded)
!   endif
  endif
  ifeq ($(findstring openbsd, $(GNUSTEP_TARGET_OS)), openbsd)
  TARGET_SYSTEM_LIBS := $(CONFIG_SYSTEM_LIBS) -lm
***************
*** 687,693 ****
  HAVE_BUNDLES	= yes
  BUNDLE_LD	= $(CC)
  BUNDLE_LDFLAGS	+= -shared
! ADDITIONAL_LDFLAGS += -rdynamic -Wl,-R/usr/pkg/lib -L/usr/pkg/lib
  ADDITIONAL_INCLUDE_DIRS += -I/usr/pkg/include
  STATIC_LDFLAGS += -static
  endif
--- 692,698 ----
  HAVE_BUNDLES	= yes
  BUNDLE_LD	= $(CC)
  BUNDLE_LDFLAGS	+= -shared
! ADDITIONAL_LDFLAGS += -rdynamic -Wl,-R/usr/pkg/lib -L/usr/pkg/lib -Wl,-R/usr/X11R6/lib -L/usr/X11R6/lib
  ADDITIONAL_INCLUDE_DIRS += -I/usr/pkg/include
  STATIC_LDFLAGS += -static
  endif