diff options
| author | adam <adam@pkgsrc.org> | 2004-12-02 12:27:08 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2004-12-02 12:27:08 +0000 |
| commit | 4533b09ac0b7e9c1f726527b6c69159e31e5a170 (patch) | |
| tree | 3d2b2b98e2a826b649a6e5fa6a4ec9648dc93fe3 /net/gnugk/patches/patch-aa | |
| parent | 2ae636e7839e6b487df3bb47a5433afe60ecda40 (diff) | |
| download | pkgsrc-4533b09ac0b7e9c1f726527b6c69159e31e5a170.tar.gz | |
Changes 2.2.0:
* Unknown
Diffstat (limited to 'net/gnugk/patches/patch-aa')
| -rw-r--r-- | net/gnugk/patches/patch-aa | 45 |
1 files changed, 33 insertions, 12 deletions
diff --git a/net/gnugk/patches/patch-aa b/net/gnugk/patches/patch-aa index a64e82f3d01..e0aaf9dee87 100644 --- a/net/gnugk/patches/patch-aa +++ b/net/gnugk/patches/patch-aa @@ -1,16 +1,37 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/10/09 20:47:21 mjl Exp $ +$NetBSD: patch-aa,v 1.2 2004/12/02 12:27:08 adam Exp $ ---- Makefile.orig 2004-10-09 09:27:17.000000000 +0200 -+++ Makefile 2004-10-09 09:27:40.000000000 +0200 -@@ -119,9 +119,9 @@ - OPENH323DIR=$(HOME)/openh323 - endif +--- Makefile.in.orig 2004-08-06 13:44:10.000000000 +0000 ++++ Makefile.in +@@ -47,8 +47,8 @@ space:=$(empty) $(empty) + .DELETE_ON_ERROR: --VERSION_FILE := $(OPENH323DIR)/version.h -+VERSION_FILE := $(OPENH323DIR)/include/openh323/version.h + # setup various important paths +-PWLIBDIR=@PWLIBDIR@ +-OPENH323DIR=@OPENH323DIR@ ++PWLIBDIR=${PREFIX} ++OPENH323DIR=${PREFIX} + OPENH323MAKEDIR=@OPENH323MAKEDIR@ --include $(OPENH323DIR)/openh323u.mak -+include $(OPENH323DIR)/share/openh323/openh323u.mak + ifndef TMP +@@ -73,10 +73,10 @@ gkdefault: bothdepend bothshared - ### Remove -fdata-sections gcc option that cause problems during link step - temp_STDCCFLAGS := $(subst -fdata-sections,,$(STDCCFLAGS)) + # 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; \ |