$NetBSD: patch-ac,v 1.6 2004/10/09 19:33:47 mjl Exp $

--- openh323u.mak.in.orig	2004-06-10 15:16:30.000000000 +0200
+++ openh323u.mak.in	2004-10-09 18:22:57.000000000 +0200
@@ -156,8 +156,8 @@
 # Added auto inclusion of ptlib make rules
 #
 
-PWLIBDIR	= @PWLIBDIR@
-OPENH323DIR	= @OPENH323DIR@
+PWLIBDIR	= $(PREFIX)
+OPENH323DIR?= $(PREFIX)
 STDCCFLAGS	+= @STDCCFLAGS@
 LDFLAGS		+= @LDFLAGS@
 ENDLDLIBS	:= @ENDLDLIBS@ $(ENDLDLIBS)
@@ -170,12 +170,12 @@
 NOTRACE	             = @NOTRACE@
 
 ifdef LIBRARY_MAKEFILE
-include $(PWLIBDIR)/make/unix.mak
+include $(PWLIBDIR)/share/pwlib/make/unix.mak
 else
 ifeq ($(NOTRACE), 1)
 OBJDIR_SUFFIX := n
 endif
-include $(PWLIBDIR)/make/ptlib.mak
+include $(PWLIBDIR)/share/pwlib/make/ptlib.mak
 endif
 
 LIBDIRS += $(OPENH323DIR)
@@ -184,9 +184,9 @@
 
 OH323_SRCDIR = $(OPENH323DIR)/src
 ifdef PREFIX
-OH323_INCDIR = $(PREFIX)/include/openh323
+OH323_INCDIR = $(OPENH323DIR)/include/openh323
 else
-OH323_INCDIR = $(OPENH323DIR)/include
+OH323_INCDIR = $(OPENH323DIR)/include/openh323
 endif
 ifndef OH323_LIBDIR
 OH323_LIBDIR = $(OPENH323DIR)/lib
@@ -209,11 +209,11 @@
 #STDCCFLAGS += -DNO_H323_VIDEO
 #endif
 
-OH323_BASE  = h323_$(PLATFORM_TYPE)_$(OH323_SUFFIX)$(LIB_TYPE)
+OH323_BASE  = h323
 OH323_FILE  = lib$(OH323_BASE).$(LIB_SUFFIX)
 
-LDFLAGS	    += -L$(OH323_LIBDIR)
-LDLIBS	    := -l$(OH323_BASE) $(LDLIBS)
+# LDFLAGS	    += -L$(OH323_LIBDIR)
+LDLIBS	    := $(OH323_LIBDIR)/lib$(OH323_BASE).$(LIB_SUFFIX) $(LDLIBS)
 
 STDCCFLAGS  += -I$(OH323_INCDIR)