$NetBSD: patch-aa,v 1.2 2004/12/02 12:27:08 adam Exp $

--- Makefile.in.orig	2004-08-06 13:44:10.000000000 +0000
+++ Makefile.in
@@ -47,8 +47,8 @@ space:=$(empty) $(empty)
 .DELETE_ON_ERROR:
 
 # setup various important paths
-PWLIBDIR=@PWLIBDIR@
-OPENH323DIR=@OPENH323DIR@
+PWLIBDIR=${PREFIX}
+OPENH323DIR=${PREFIX}
 OPENH323MAKEDIR=@OPENH323MAKEDIR@
 
 ifndef TMP
@@ -73,10 +73,10 @@ gkdefault: bothdepend bothshared
 
 # LD_RUN_LIST is the list form of the LD_RUN_PATH
 LD_RUN_LIST := $(subst $(colon),$(space),$(LD_RUN_PATH))
-LD_RUN_LIST += $(PWLIBDIR)/lib $(OPENH323DIR)/lib
+LD_RUN_LIST += ${PREFIX}/lib
 
 # compiler/linker flags set by configure script
-STDCCFLAGS += @STDCCFLAGS@
+STDCCFLAGS += @STDCCFLAGS@ ${CXXFLAGS}
 LDFLAGS    += @LDFLAGS@
 ENDLDLIBS  += @ENDLDLIBS@
 ENDLDFLAGS += @ENDLDFLAGS@
@@ -111,7 +111,7 @@ versionts.h: $(subst version.cxx,,$(SOUR
 
 # extra targets
 addpasswd: $(OBJDIR)/addpasswd.o
-	$(CXX) -o $(OBJDIR)/addpasswd $(CFLAGS) $(OBJDIR)/addpasswd.o $(LDFLAGS) -l$(PTLIB_BASE)$(LIB_TYPE) $(ENDLDLIBS) $(ENDLDFLAGS)
+	$(CXX) -o $(OBJDIR)/addpasswd $(CXXFLAGS) $(OBJDIR)/addpasswd.o $(LDFLAGS) -l$(PTLIB_BASE)$(LIB_TYPE) $(ENDLDLIBS) $(ENDLDFLAGS)
 
 doc:	docs/manual.sgml
 	cd docs; sgml2html manual.sgml; \