*** ../pwlib/make/unix.mak.orig	Fri Nov 22 10:59:27 2002
--- ../pwlib/make/unix.mak	Tue Jan 28 13:51:15 2003
*************** ifeq ($(OSTYPE),FreeBSD)
*** 770,780 ****
  
  P_PTHREADS	:= 1
  
! ifeq ($(MACHTYPE),x86)
! ifdef CPUTYPE
! STDCCFLAGS	+= -mcpu=$(CPUTYPE)
! endif
! endif
  
  ifndef OSRELEASE
  OSRELEASE	:= $(shell sysctl -n kern.osreldate)
--- 770,780 ----
  
  P_PTHREADS	:= 1
  
! #ifeq ($(MACHTYPE),x86)
! #ifdef CPUTYPE
! #STDCCFLAGS	+= -mcpu=$(CPUTYPE)
! #endif
! #endif
  
  ifndef OSRELEASE
  OSRELEASE	:= $(shell sysctl -n kern.osreldate)
*************** SHELL		:= /bin/sh
*** 1335,1345 ****
  
  # Directories
  
- ifdef PREFIX
- UNIX_INC_DIR	= $(PREFIX)/include/ptlib/unix
- else
  UNIX_INC_DIR	= $(PWLIBDIR)/include/ptlib/unix
- endif
  
  ifndef UNIX_SRC_DIR
  UNIX_SRC_DIR	= $(PWLIBDIR)/src/ptlib/unix
--- 1335,1341 ----
*************** LDFLAGS		+= $(DEBLDFLAGS)
*** 1375,1381 ****
  
  else
  
! OPTCCFLAGS	+= -O3 -DNDEBUG
  #OPTCCFLAGS	+= -DP_USE_INLINES=1
  #OPTCCFLAGS	+= -fconserve-space
  ifneq ($(OSTYPE),Carbon)
--- 1371,1378 ----
  
  else
  
! #OPTCCFLAGS	+= -O3 -DNDEBUG
! OPTCCFLAGS	+= -DNDEBUG
  #OPTCCFLAGS	+= -DP_USE_INLINES=1
  #OPTCCFLAGS	+= -fconserve-space
  ifneq ($(OSTYPE),Carbon)