- fix OH323_INCDIR and OH323_LIBDIR locations

from Stuart Henderson, thanks ;)
This commit is contained in:
ajacoutot 2007-08-02 14:37:31 +00:00
parent 51e180d2d2
commit c62f200265
2 changed files with 15 additions and 10 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.12 2007/04/30 10:34:47 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.13 2007/08/02 14:37:31 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= "H.323 video conferencing library"
DISTNAME= openh323-v1_18_0
PKGNAME= openh323-1.18.0p1
PKGNAME= openh323-1.18.0p2
CATEGORIES= net devel
EXTRACT_SUFX= -src-tar.gz

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-openh323u_mak_in,v 1.1 2007/04/26 14:10:30 ajacoutot Exp $
--- openh323u.mak.in.orig Mon Jan 3 07:25:51 2005
+++ openh323u.mak.in Thu Apr 12 11:11:58 2007
$OpenBSD: patch-openh323u_mak_in,v 1.2 2007/08/02 14:37:31 ajacoutot Exp $
--- openh323u.mak.in.orig Mon Jan 3 06:25:51 2005
+++ openh323u.mak.in Wed Aug 1 18:40:01 2007
@@ -163,8 +163,12 @@
#
@ -14,22 +14,27 @@ $OpenBSD: patch-openh323u_mak_in,v 1.1 2007/04/26 14:10:30 ajacoutot Exp $
LDFLAGS += @LDFLAGS@
LDLIBS += @LDLIBS@
ENDLDLIBS := @ENDLDLIBS@ $(ENDLDLIBS)
@@ -197,11 +201,11 @@ LIBDIRS += $(OPENH323DIR)
@@ -197,15 +201,13 @@ LIBDIRS += $(OPENH323DIR)
#OH323_SUPPRESS_H235 = 1
OH323_SRCDIR = $(OPENH323DIR)/src
-ifdef PREFIX
-OH323_INCDIR = $(PREFIX)/include/openh323
+ifndef BUILDSELF
+OH323_INCDIR = $(OPENH323DIR)/include/openh323
+OH323_INCDIR = !!PREFIX!!/include/openh323
+OH323_LIBDIR = !!PREFIX!!/lib
else
OH323_INCDIR = $(OPENH323DIR)/include
-endif # PREFIX
-
-ifndef OH323_LIBDIR
OH323_LIBDIR = $(OPENH323DIR)/lib
-endif # OH323_LIBDIR
+endif
ifndef OH323_LIBDIR
OH323_LIBDIR = $(OPENH323DIR)/lib
@@ -216,8 +220,12 @@ RCFLAGS += -DPTRACING
ifeq ($(NOTRACE), 1)
STDCCFLAGS += -DPASN_NOPRINTON -DPASN_LEANANDMEAN
@@ -216,8 +218,12 @@ RCFLAGS += -DPTRACING
OH323_SUFFIX = $(OBJ_SUFFIX)
endif # NOTRACE