$OpenBSD: patch-pwlib_make_unix_mak,v 1.3 2002/09/14 14:46:32 couderc Exp $
--- pwlib/make/unix.mak.orig	Thu Apr 18 07:12:20 2002
+++ pwlib/make/unix.mak	Sat Sep 14 12:27:12 2002
@@ -668,24 +668,24 @@ ifeq ($(OSTYPE),OpenBSD)
 
 P_PTHREADS	:= 1
 
-ifeq ($(MACHTYPE),x86)
-STDCCFLAGS	+= -m486
-endif
-
 LDLIBS		+= -lossaudio
 
-ifndef OSRELASE
+ifndef OSRELEASE
 OSRELEASE	:= $(shell sysctl -n kern.osrevision)
 endif
- 
+
+CC		:= ${CC} 
+CPLUS		:= ${CXX}
+CFLAGS		+= ${CFLAGS}
+ENDIAN		:= ${ENDIAN}
 STDCCFLAGS	+= -DP_OPENBSD=$(OSRELEASE)
 
-ifdef P_PTHREADS
+#ifdef P_PTHREADS
 CFLAGS	+= -pthread
-endif
+#endif
 
 P_USE_RANLIB		:= 1
-
+HAS_EXPAT		:= 0
 endif # OpenBSD
 
 
@@ -1106,7 +1106,7 @@ endif
 PW_LIBDIR	= $(PWLIBDIR)/lib
 
 # set name of the PT library
-PTLIB_BASE	= pt_$(PLATFORM_TYPE)_$(OBJ_SUFFIX)
+PTLIB_BASE	= pt
 PTLIB_FILE	= lib$(PTLIB_BASE)$(LIB_TYPE).$(LIB_SUFFIX)
 PT_OBJBASE	= obj_$(PLATFORM_TYPE)_$(OBJDIR_SUFFIX)
 PT_OBJDIR	= $(PW_LIBDIR)/$(PT_OBJBASE)
@@ -1133,7 +1133,8 @@ LDFLAGS		+= $(DEBLDFLAGS)
 
 else
 
-OPTCCFLAGS	+= -O3 -DNDEBUG
+OPTCCFLAGS	+= -DNDEBUG
+#OPTCCFLAGS	+= -O3 -DNDEBUG
 #OPTCCFLAGS	+= -DP_USE_INLINES=1
 #OPTCCFLAGS	+= -fconserve-space
 ifneq ($(OSTYPE),Carbon)
@@ -1172,18 +1173,18 @@ endif
 
 
 # define expat (XML parser) variables if installed
-ifneq (,$(wildcard $(SYSINCDIR)/expat.h))
-HAS_EXPAT	= 1
-ENDLDLIBS	+= -lexpat
-STDCCFLAGS	+= -DP_EXPAT
-endif
-
-ifneq (,$(wildcard /usr/local/include/expat.h))
-HAS_EXPAT	= 1
-ENDLDLIBS	+= -lexpat
-STDCCFLAGS	+= -DP_EXPAT -I /usr/local/include
-LDFLAGS		+= -L /usr/local/lib
-endif
+# ifneq (,$(wildcard $(SYSINCDIR)/expat.h))
+# HAS_EXPAT	= 1
+# ENDLDLIBS	+= -lexpat
+# STDCCFLAGS	+= -DP_EXPAT
+# endif
+
+# ifneq (,$(wildcard /usr/local/include/expat.h))
+# HAS_EXPAT	= 1
+# ENDLDLIBS	+= -lexpat
+# STDCCFLAGS	+= -DP_EXPAT -I /usr/local/include
+# LDFLAGS		+= -L /usr/local/lib
+# endif
 
 
 # define ESDDIR variables if installed