summaryrefslogtreecommitdiff
path: root/comms
diff options
context:
space:
mode:
authorjnemeth <jnemeth@pkgsrc.org>2010-01-13 20:10:09 +0000
committerjnemeth <jnemeth@pkgsrc.org>2010-01-13 20:10:09 +0000
commit4a79528ac31573872f59a5043f79ae53aafc669b (patch)
tree7f72c23e73a6efdac60f0468e85e4f1c3f3ec883 /comms
parent70d21f50fe4cd51442180cdad2eb89adf609f4ae (diff)
downloadpkgsrc-4a79528ac31573872f59a5043f79ae53aafc669b.tar.gz
PR/42612 - Dima Veselov -- build problem when no options specified
Diffstat (limited to 'comms')
-rw-r--r--comms/asterisk16/Makefile3
-rw-r--r--comms/asterisk16/options.mk3
2 files changed, 3 insertions, 3 deletions
diff --git a/comms/asterisk16/Makefile b/comms/asterisk16/Makefile
index 90dd070aee0..89f292d6bad 100644
--- a/comms/asterisk16/Makefile
+++ b/comms/asterisk16/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2009/12/30 04:11:02 jnemeth Exp $
+# $NetBSD: Makefile,v 1.11 2010/01/13 20:10:09 jnemeth Exp $
#
DISTNAME= asterisk-1.6.1.12
@@ -79,7 +79,6 @@ MAKE_FLAGS+= ASTDBDIR=${ASTDBDIR}
MAKE_FLAGS+= AGI_DIR=${PREFIX}/libexec/agi-bin
MAKE_FLAGS+= ASTEXAMPLEDIR=${ASTEXAMPLEDIR}
MAKE_FLAGS+= WRKSRC=${WRKSRC}
-MAKE_FLAGS+= GLOBAL_MAKEOPTS=${WRKSRC}/pkgsrc.makeopts
MAKE_FLAGS+= LDOPTS=${LDFLAGS:M*:Q}
.include "options.mk"
diff --git a/comms/asterisk16/options.mk b/comms/asterisk16/options.mk
index 5b5356f83e5..a501770601c 100644
--- a/comms/asterisk16/options.mk
+++ b/comms/asterisk16/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2010/01/02 00:36:54 jnemeth Exp $
+# $NetBSD: options.mk,v 1.3 2010/01/13 20:10:09 jnemeth Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.asterisk
PKG_SUPPORTED_OPTIONS= zaptel x11 unixodbc ilbc
@@ -52,6 +52,7 @@ PLIST.ilbc= yes
.if !empty(PKG_OPTIONS:Mx11) || !empty(PKG_OPTIONS:Munixodbc) || !empty(PKG_OPTIONS:Milbc)
RUN_MENUSELECT= # defined
+MAKE_FLAGS+= GLOBAL_MAKEOPTS=${WRKSRC}/pkgsrc.makeopts
.endif
post-configure:
.if !empty(PKG_OPTIONS:Mx11)