*** make/unix.mak.orig	Thu Jul 24 22:01:42 2003
--- make/unix.mak	Fri Jun  3 15:13:47 2005
***************
*** 358,368 ****
  
  ifeq ($(OSTYPE),FreeBSD)
  
! ifeq ($(MACHTYPE),x86)
! ifdef CPUTYPE
! STDCCFLAGS	+= -mcpu=$(CPUTYPE)
! endif
! endif
  
  ifndef OSRELEASE
  OSRELEASE	:= $(shell sysctl -n kern.osreldate)
--- 358,368 ----
  
  ifeq ($(OSTYPE),FreeBSD)
  
! #ifeq ($(MACHTYPE),x86)
! #ifdef CPUTYPE
! #STDCCFLAGS	+= -mcpu=$(CPUTYPE)
! #endif
! #endif
  
  ifndef OSRELEASE
  OSRELEASE	:= $(shell sysctl -n kern.osreldate)
***************
*** 891,901 ****
  
  # 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
--- 891,901 ----
  
  # 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
***************
*** 932,938 ****
  else
  
  ifneq ($(OSTYPE),Darwin)
!   OPTCCFLAGS	+= -Os -DNDEBUG
  else
    OPTCCFLAGS	+= -O2 -DNDEBUG
  endif
--- 932,939 ----
  else
  
  ifneq ($(OSTYPE),Darwin)
! #  OPTCCFLAGS	+= -Os -DNDEBUG
!   OPTCCFLAGS	+= -DNDEBUG
  else
    OPTCCFLAGS	+= -O2 -DNDEBUG
  endif