blob: e0aaf9dee8783ed3ce04973b748538344ffd64e7 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
|
$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; \
|
