- Check for LOCALBASE, not for PREFIX. This fixes dependent port

build with overridden PREFIX
- Bump PORTREVISION

Approved by:	MAINTAINER
This commit is contained in:
Max Khon 2006-04-27 20:37:25 +00:00
parent 7a6f260623
commit 45e13c59df
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=160609
2 changed files with 13 additions and 10 deletions

View file

@ -7,6 +7,7 @@
PORTNAME= openh323
PORTVERSION= 1.18.0
PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.voxgratia.org/releases/
DISTNAME= ${PORTNAME}-v${PORTVERSION:S/./_/g}-src-

View file

@ -1,5 +1,5 @@
--- openh323u.mak.in.orig Tue Mar 7 15:45:47 2006
+++ openh323u.mak.in Tue Mar 7 15:50:52 2006
--- openh323u.mak.in.orig Mon Jan 3 12:25:51 2005
+++ openh323u.mak.in Wed Apr 26 11:37:40 2006
@@ -163,7 +163,15 @@
#
@ -16,26 +16,28 @@
STDCCFLAGS += @STDCCFLAGS@
LDFLAGS += @LDFLAGS@
LDLIBS += @LDLIBS@
@@ -197,12 +205,19 @@
@@ -197,11 +205,18 @@
#OH323_SUPPRESS_H235 = 1
OH323_SRCDIR = $(OPENH323DIR)/src
-ifdef PREFIX
-OH323_INCDIR = $(PREFIX)/include/openh323
+
ifdef PREFIX
OH323_INCDIR = $(PREFIX)/include/openh323
+OH323_LIBDIR = $(PREFIX)/lib
+ifdef LOCALBASE
+OH323_INCDIR = $(LOCALBASE)/include/openh323
+OH323_LIBDIR = $(LOCALBASE)/lib
else
OH323_INCDIR = $(OPENH323DIR)/include
endif # PREFIX
-endif # PREFIX
+endif # LOCALBASE
+
+ifdef BUILDTIME
+OH323_INCDIR = ${OPENH323DIR}/include
+OH323_LIBDIR = $(OPENH323DIR)/lib
+endif #BUILDTIME
+
ifndef OH323_LIBDIR
OH323_LIBDIR = $(OPENH323DIR)/lib
endif # OH323_LIBDIR
@@ -216,7 +231,7 @@
OH323_SUFFIX = $(OBJ_SUFFIX)
endif # NOTRACE