summaryrefslogtreecommitdiff
path: root/comms/asterisk
diff options
context:
space:
mode:
Diffstat (limited to 'comms/asterisk')
-rw-r--r--comms/asterisk/Makefile8
-rw-r--r--comms/asterisk/PLIST12
-rw-r--r--comms/asterisk/distinfo20
-rw-r--r--comms/asterisk/patches/patch-apps_app__queue.c30
-rw-r--r--comms/asterisk/patches/patch-configure32
-rw-r--r--comms/asterisk/patches/patch-main_Makefile20
6 files changed, 62 insertions, 60 deletions
diff --git a/comms/asterisk/Makefile b/comms/asterisk/Makefile
index 3ab757e519c..bbc64a46339 100644
--- a/comms/asterisk/Makefile
+++ b/comms/asterisk/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.84 2013/04/10 05:28:56 jnemeth Exp $
+# $NetBSD: Makefile,v 1.85 2013/05/05 01:32:34 jnemeth Exp $
#
# NOTE: when updating this package, there are two places that sound
# tarballs need to be checked
-DISTNAME= asterisk-11.2.2
+DISTNAME= asterisk-11.3.0
DIST_SUBDIR= ${PKGNAME_NOREV}
DISTFILES= ${DEFAULT_DISTFILES}
EXTRACT_ONLY= ${DISTNAME}.tar.gz
@@ -109,7 +109,7 @@ PLIST.mgcp= yes
.include "options.mk"
# check sounds/Makefile for current version when upgrading package
-DISTFILES+= asterisk-extra-sounds-en-gsm-1.4.11.tar.gz
+DISTFILES+= asterisk-extra-sounds-en-gsm-1.4.13.tar.gz
# Override default paths in config files
SUBST_CLASSES+= configs
@@ -202,7 +202,7 @@ post-patch:
post-install:
# check sounds directory for current versions when upgrading package
- ${TAR} xzf ${WRKSRC}/sounds/asterisk-core-sounds-en-gsm-1.4.22.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
+ ${TAR} xzf ${WRKSRC}/sounds/asterisk-core-sounds-en-gsm-1.4.23.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
${TAR} xzf ${WRKSRC}/sounds/asterisk-moh-opsound-wav-2.03.tar.gz -C ${DESTDIR}${ASTDATADIR}/moh
${TAR} xzf ${DISTDIR}/${DIST_SUBDIR}/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
${INSTALL_DATA} ${WRKSRC}/BUGS ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
diff --git a/comms/asterisk/PLIST b/comms/asterisk/PLIST
index 282cb12a1c0..db313d5d202 100644
--- a/comms/asterisk/PLIST
+++ b/comms/asterisk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2012/12/11 08:22:48 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/05/05 01:32:34 jnemeth Exp $
include/asterisk.h
include/asterisk/_private.h
include/asterisk/abstract_jb.h
@@ -377,13 +377,13 @@ libdata/asterisk/phoneprov/000000000000.cfg
libdata/asterisk/phoneprov/polycom.xml
libdata/asterisk/phoneprov/polycom_line.xml
libdata/asterisk/phoneprov/snom-mac.xml
-libdata/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.22
+libdata/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.23
libdata/asterisk/sounds/en/1-for-am-2-for-pm.gsm
libdata/asterisk/sounds/en/1-yes-2-no.gsm
-libdata/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.22
+libdata/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.23
libdata/asterisk/sounds/en/CHANGES-asterisk-extra-en-1.4.11
-libdata/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.22
-libdata/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.22
+libdata/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.23
+libdata/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.23
libdata/asterisk/sounds/en/T-changed-to.gsm
libdata/asterisk/sounds/en/T-is-not-available.gsm
libdata/asterisk/sounds/en/T-to-disable-ancmnt.gsm
@@ -581,6 +581,8 @@ libdata/asterisk/sounds/en/computer-friend1.gsm
libdata/asterisk/sounds/en/computer-friend2.gsm
libdata/asterisk/sounds/en/conditions.gsm
libdata/asterisk/sounds/en/conf-adminmenu-162.gsm
+libdata/asterisk/sounds/en/conf-adminmenu-18.gsm
+libdata/asterisk/sounds/en/conf-adminmenu-menu8.gsm
libdata/asterisk/sounds/en/conf-adminmenu.gsm
libdata/asterisk/sounds/en/conf-banned.gsm
libdata/asterisk/sounds/en/conf-enteringno.gsm
diff --git a/comms/asterisk/distinfo b/comms/asterisk/distinfo
index 03149b02d97..98779f6580a 100644
--- a/comms/asterisk/distinfo
+++ b/comms/asterisk/distinfo
@@ -1,19 +1,19 @@
-$NetBSD: distinfo,v 1.54 2013/04/10 05:28:56 jnemeth Exp $
+$NetBSD: distinfo,v 1.55 2013/05/05 01:32:34 jnemeth Exp $
-SHA1 (asterisk-11.2.2/asterisk-11.2.2.tar.gz) = e23062d1ce4a75e1c464e9557e681d9d259a843a
-RMD160 (asterisk-11.2.2/asterisk-11.2.2.tar.gz) = f8f2d3dcba5294a4a4b2d8c5b768e4cc1aab1f76
-Size (asterisk-11.2.2/asterisk-11.2.2.tar.gz) = 30468125 bytes
-SHA1 (asterisk-11.2.2/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 8692fa61423b4769dc8bfa78faf9ed5ef7a259b9
-RMD160 (asterisk-11.2.2/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 68170c769d739d6b5b35b00f999ad6bbf876f9f6
-Size (asterisk-11.2.2/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898 bytes
+SHA1 (asterisk-11.3.0/asterisk-11.3.0.tar.gz) = 75b822fd57c45a150b2c0d33e7746ebf6497e59d
+RMD160 (asterisk-11.3.0/asterisk-11.3.0.tar.gz) = b9376f8413f53713e83d0fc6d760cf196201ec9e
+Size (asterisk-11.3.0/asterisk-11.3.0.tar.gz) = 30629838 bytes
+SHA1 (asterisk-11.3.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 3aac6cf4a07cb2644b7b5369c618b07561619f9f
+RMD160 (asterisk-11.3.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 5dc9696c54d2233cf74835fe7ccd2c1791f20041
+Size (asterisk-11.3.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 4407925 bytes
SHA1 (patch-Makefile) = cc52fad87c4007103e2b5b75acfd82935c112150
SHA1 (patch-apps_app__dial.c) = 0f78d2571af88384a2d472ece08bf4b06f9ad211
SHA1 (patch-apps_app__followme.c) = a54e08d0dd0b6ff12281d4b7b8447707c1cbe20a
-SHA1 (patch-apps_app__queue.c) = 9a5adbd38b612bd2d06f00577b529dcd1ff73e6a
+SHA1 (patch-apps_app__queue.c) = 5bdb602a709060a1ffca688830930f1ca6bc5841
SHA1 (patch-apps_app__sms.c) = d89b27a9df04d4da98d562241c07d25d182baefc
SHA1 (patch-build__tools_mkpkgconfig) = 2bd3c0e24bc6d721cc234feb19b64a57106fcbe4
SHA1 (patch-channels_chan__oss.c) = fccfa6fca010294ed2d3ab87fc31f436d67f49fa
-SHA1 (patch-configure) = bf090dc48cc6025ceb55fc538fe829ea89841219
+SHA1 (patch-configure) = 494ff2f430be98522d65ede142819cd2dfebfef0
SHA1 (patch-configure.ac) = fa39e67fe998d0fe7dfb5fb3988f2be712b3b29f
SHA1 (patch-contrib_scripts_autosupport) = c6c1d917dd0544c4f54ae760f68cbcd1f35030f4
SHA1 (patch-contrib_scripts_vmail.cgi) = 650b9bbf3e322d1ad351932cfe6f747baa8f35e4
@@ -21,7 +21,7 @@ SHA1 (patch-include_asterisk_autoconfig.h.in) = 1d658b1997b3664cf34d01f1903fa38c
SHA1 (patch-include_asterisk_endian.h) = 41c1a9a9e02fe394bc9261f5559e931b1378ea28
SHA1 (patch-include_asterisk_inline__api.h) = ff43d14e2608dd08d7d03799dfe9847f9f7f5666
SHA1 (patch-include_asterisk_lock.h) = fc7b4934e5f53a09066802daa054300895cf7bcf
-SHA1 (patch-main_Makefile) = 741292713ec8e8968aefc87efa86a1629342b4f8
+SHA1 (patch-main_Makefile) = 5f9238a528d2b96777e17a4ac6d3e7876dfffb98
SHA1 (patch-main_acl.c) = 1eac532a15127c25981d2db9462a8ccce2c58620
SHA1 (patch-main_asterisk.c) = df7bcdaeb2fc90f9fdc1b16388fbb5cf7eba141c
SHA1 (patch-main_features.c) = 1c11207c60ce53c1101141e07ae04d0ddb838450
diff --git a/comms/asterisk/patches/patch-apps_app__queue.c b/comms/asterisk/patches/patch-apps_app__queue.c
index 8fd934b32d8..f17fd7ef273 100644
--- a/comms/asterisk/patches/patch-apps_app__queue.c
+++ b/comms/asterisk/patches/patch-apps_app__queue.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-apps_app__queue.c,v 1.1 2012/12/11 08:22:48 jnemeth Exp $
+$NetBSD: patch-apps_app__queue.c,v 1.2 2013/05/05 01:32:35 jnemeth Exp $
---- apps/app_queue.c.orig 2012-10-01 20:26:09.000000000 +0000
+--- apps/app_queue.c.orig 2013-01-09 00:03:40.000000000 +0000
+++ apps/app_queue.c
-@@ -4550,7 +4550,7 @@ static int wait_our_turn(struct queue_en
+@@ -4717,7 +4717,7 @@ static int wait_our_turn(struct queue_en
if ((status = get_member_status(qe->parent, qe->max_penalty, qe->min_penalty, qe->parent->leavewhenempty))) {
*reason = QUEUE_LEAVEEMPTY;
@@ -11,7 +11,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.1 2012/12/11 08:22:48 jnemeth Exp $
leave_queue(qe);
break;
}
-@@ -4789,12 +4789,12 @@ static void send_agent_complete(const st
+@@ -4957,12 +4957,12 @@ static void send_agent_complete(const st
"Channel: %s\r\n"
"Member: %s\r\n"
"MemberName: %s\r\n"
@@ -27,7 +27,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.1 2012/12/11 08:22:48 jnemeth Exp $
qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES ? vars2manager(qe->chan, vars, vars_len) : "");
}
-@@ -4837,9 +4837,9 @@ static void queue_transfer_fixup(void *d
+@@ -5005,9 +5005,9 @@ static void queue_transfer_fixup(void *d
int callcompletedinsl = qtds->callcompletedinsl;
struct ast_datastore *datastore;
@@ -40,7 +40,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.1 2012/12/11 08:22:48 jnemeth Exp $
update_queue(qe->parent, member, callcompletedinsl, (time(NULL) - callstart));
-@@ -5356,7 +5356,7 @@ static int try_calling(struct queue_ent
+@@ -5524,7 +5524,7 @@ static int try_calling(struct queue_ent
} else if (ast_check_hangup(qe->chan)) {
/* Caller must have hung up just before being connected */
ast_log(LOG_NOTICE, "Caller was about to talk to agent on %s but the caller hungup.\n", ast_channel_name(peer));
@@ -49,7 +49,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.1 2012/12/11 08:22:48 jnemeth Exp $
record_abandoned(qe);
ast_autoservice_chan_hangup_peer(qe->chan, peer);
ao2_ref(member, -1);
-@@ -5405,8 +5405,8 @@ static int try_calling(struct queue_ent
+@@ -5573,8 +5573,8 @@ static int try_calling(struct queue_ent
/* if setqueueentryvar is defined, make queue entry (i.e. the caller) variables available to the channel */
/* use pbx_builtin_setvar to set a load of variables with one call */
if (qe->parent->setqueueentryvar) {
@@ -60,7 +60,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.1 2012/12/11 08:22:48 jnemeth Exp $
pbx_builtin_setvar_multiple(qe->chan, interfacevar);
pbx_builtin_setvar_multiple(peer, interfacevar);
}
-@@ -5623,8 +5623,8 @@ static int try_calling(struct queue_ent
+@@ -5791,8 +5791,8 @@ static int try_calling(struct queue_ent
}
}
qe->handled++;
@@ -71,7 +71,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.1 2012/12/11 08:22:48 jnemeth Exp $
if (ast_channel_cdr(qe->chan)) {
struct ast_cdr *cdr;
-@@ -5678,12 +5678,12 @@ static int try_calling(struct queue_ent
+@@ -5846,12 +5846,12 @@ static int try_calling(struct queue_ent
"Channel: %s\r\n"
"Member: %s\r\n"
"MemberName: %s\r\n"
@@ -87,7 +87,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.1 2012/12/11 08:22:48 jnemeth Exp $
qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES ? vars2manager(qe->chan, vars, sizeof(vars)) : "");
ast_copy_string(oldcontext, ast_channel_context(qe->chan), sizeof(oldcontext));
ast_copy_string(oldexten, ast_channel_exten(qe->chan), sizeof(oldexten));
-@@ -5715,17 +5715,17 @@ static int try_calling(struct queue_ent
+@@ -5883,17 +5883,17 @@ static int try_calling(struct queue_ent
/* detect a blind transfer */
if (!(ast_channel_softhangup_internal_flag(qe->chan) | ast_channel_softhangup_internal_flag(peer)) && (strcasecmp(oldcontext, ast_channel_context(qe->chan)) || strcasecmp(oldexten, ast_channel_exten(qe->chan)))) {
@@ -98,7 +98,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.1 2012/12/11 08:22:48 jnemeth Exp $
+ ast_channel_exten(qe->chan), ast_channel_context(qe->chan), (intmax_t) (callstart - qe->start),
+ (intmax_t) (time(NULL) - callstart), qe->opos);
send_agent_complete(qe, queuename, peer, member, callstart, vars, sizeof(vars), TRANSFER);
- } else if (ast_check_hangup(qe->chan)) {
+ } else if (ast_check_hangup(qe->chan) && !ast_check_hangup(peer)) {
- ast_queue_log(queuename, ast_channel_uniqueid(qe->chan), member->membername, "COMPLETECALLER", "%ld|%ld|%d",
- (long) (callstart - qe->start), (long) (time(NULL) - callstart), qe->opos);
+ ast_queue_log(queuename, ast_channel_uniqueid(qe->chan), member->membername, "COMPLETECALLER", "%jd|%jd|%d",
@@ -112,7 +112,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.1 2012/12/11 08:22:48 jnemeth Exp $
send_agent_complete(qe, queuename, peer, member, callstart, vars, sizeof(vars), AGENT);
}
if ((tds = ast_channel_datastore_find(qe->chan, &queue_transfer_info, NULL))) {
-@@ -6902,8 +6902,8 @@ check_turns:
+@@ -7070,8 +7070,8 @@ check_turns:
record_abandoned(&qe);
reason = QUEUE_TIMEOUT;
res = 0;
@@ -123,7 +123,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.1 2012/12/11 08:22:48 jnemeth Exp $
break;
}
-@@ -6947,7 +6947,7 @@ check_turns:
+@@ -7115,7 +7115,7 @@ check_turns:
if ((status = get_member_status(qe.parent, qe.max_penalty, qe.min_penalty, qe.parent->leavewhenempty))) {
record_abandoned(&qe);
reason = QUEUE_LEAVEEMPTY;
@@ -132,7 +132,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.1 2012/12/11 08:22:48 jnemeth Exp $
res = 0;
break;
}
-@@ -6969,7 +6969,7 @@ check_turns:
+@@ -7137,7 +7137,7 @@ check_turns:
record_abandoned(&qe);
reason = QUEUE_TIMEOUT;
res = 0;
@@ -141,7 +141,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.1 2012/12/11 08:22:48 jnemeth Exp $
break;
}
-@@ -6997,8 +6997,8 @@ stop:
+@@ -7165,8 +7165,8 @@ stop:
if (!qe.handled) {
record_abandoned(&qe);
ast_queue_log(args.queuename, ast_channel_uniqueid(chan), "NONE", "ABANDON",
diff --git a/comms/asterisk/patches/patch-configure b/comms/asterisk/patches/patch-configure
index 442765f823c..5bc29fc3893 100644
--- a/comms/asterisk/patches/patch-configure
+++ b/comms/asterisk/patches/patch-configure
@@ -1,28 +1,28 @@
-$NetBSD: patch-configure,v 1.1 2012/12/11 08:22:49 jnemeth Exp $
+$NetBSD: patch-configure,v 1.2 2013/05/05 01:32:35 jnemeth Exp $
---- configure.orig 2012-10-18 20:02:02.000000000 +0000
+--- configure.orig 2013-01-30 17:46:52.000000000 +0000
+++ configure
-@@ -23783,16 +23783,16 @@ if $(${CC} -march=native -S -o /dev/null
+@@ -16165,16 +16165,16 @@ if $(${CC} -march=native -S -o /dev/null
if test "${CONFIG_CFLAGS}" = ""; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- AST_NATIVE_ARCH=1
+ AST_NATIVE_ARCH=0
else
- { $as_echo "$as_me:$LINENO: result: user CFLAGS present" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: user CFLAGS present" >&5
$as_echo "user CFLAGS present" >&6; }
- AST_NATIVE_ARCH=
+ AST_NATIVE_ARCH=0
fi
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- AST_NATIVE_ARCH=
+ AST_NATIVE_ARCH=0
fi
-@@ -24732,6 +24732,148 @@ fi
+@@ -16699,6 +16699,148 @@ fi
@@ -171,18 +171,18 @@ $NetBSD: patch-configure,v 1.1 2012/12/11 08:22:49 jnemeth Exp $
# The cast to long int works around a bug in the HP C Compiler
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-@@ -29331,6 +29473,8 @@ _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+@@ -17840,6 +17982,8 @@ $as_echo_n "checking if \"struct ifaddrs
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-+#include <sys/types.h>
-+#include <sys/socket.h>
- #include <ifaddrs.h>
++ #include <sys/types.h>
++ #include <sys/socket.h>
+ #include <ifaddrs.h>
int
main ()
-@@ -56711,10 +56855,10 @@ cat >>confdefs.h <<\_ACEOF
- #define HAVE_SBIN_LAUNCHD 1
- _ACEOF
+@@ -29471,10 +29615,10 @@ if test "x$ac_cv_file__sbin_launchd" = x
+
+ $as_echo "#define HAVE_SBIN_LAUNCHD 1" >>confdefs.h
-fi
diff --git a/comms/asterisk/patches/patch-main_Makefile b/comms/asterisk/patches/patch-main_Makefile
index 95665a959d2..1185a86186f 100644
--- a/comms/asterisk/patches/patch-main_Makefile
+++ b/comms/asterisk/patches/patch-main_Makefile
@@ -1,6 +1,6 @@
-$NetBSD: patch-main_Makefile,v 1.1 2012/12/11 08:22:49 jnemeth Exp $
+$NetBSD: patch-main_Makefile,v 1.2 2013/05/05 01:32:35 jnemeth Exp $
---- main/Makefile.orig 2012-09-13 20:04:51.000000000 +0000
+--- main/Makefile.orig 2013-01-18 21:10:23.000000000 +0000
+++ main/Makefile
@@ -89,6 +89,10 @@ ifeq ($(OSARCH),OpenBSD)
AST_LIBS+=-lcrypto -lpthread -lm $(EDITLINE_LIB)
@@ -23,24 +23,24 @@ $NetBSD: patch-main_Makefile,v 1.1 2012/12/11 08:22:49 jnemeth Exp $
$(ASTSSL_LIB): $(ASTSSL_LIB).$(ASTSSL_SO_VERSION)
$(LN) -sf $< $@
-@@ -258,13 +259,10 @@ bininstall:
+@@ -261,13 +262,13 @@ bininstall:
$(INSTALL) -m 755 $(MAIN_TGT) "$(DESTDIR)$(ASTSBINDIR)/"
ifeq ($(AST_ASTERISKSSL),yes)
ifeq ($(findstring darwin,$(OSARCH)),) # not Darwin
- $(INSTALL) -m 755 $(ASTSSL_LIB).$(ASTSSL_SO_VERSION) "$(DESTDIR)$(ASTLIBDIR)/"
-- $(LN) -sf "$(DESTDIR)$(ASTLIBDIR)/$(ASTSSL_LIB).$(ASTSSL_SO_VERSION)" "$(DESTDIR)$(ASTLIBDIR)/$(ASTSSL_LIB)"
+- $(LN) -sf $(ASTSSL_LIB).$(ASTSSL_SO_VERSION) "$(DESTDIR)$(ASTLIBDIR)/$(ASTSSL_LIB)"
+ $(INSTALL) -m 755 $(ASTSSL_LIB).$(ASTSSL_SO_VERSION) "$(DESTDIR)$(PREFIX)/lib/"
-+ $(LN) -sf "$(DESTDIR)$(PREFIX)/lib/$(ASTSSL_LIB).$(ASTSSL_SO_VERSION)" "$(DESTDIR)$(PREFIX)/lib/$(ASTSSL_LIB)"
++ $(LN) -sf $(ASTSSL_LIB).$(ASTSSL_SO_VERSION) "$(DESTDIR)$(PREFIX)/lib/$(ASTSSL_LIB)"
else # Darwin
-- $(INSTALL) -m 755 $(ASTSSL_LIB) "$(DESTDIR)$(ASTLIBDIR)/"
--endif
--ifneq ($(LDCONFIG),)
+ $(INSTALL) -m 755 $(ASTSSL_LIB) "$(DESTDIR)$(ASTLIBDIR)/"
+ endif
+ ifneq ($(LDCONFIG),)
- $(LDCONFIG) $(LDCONFIG_FLAGS) "$(DESTDIR)$(ASTLIBDIR)/"
-+ $(INSTALL) -m 755 $(ASTSSL_LIB) "$(DESTDIR)$(PREFIX)/lib/"
++ $(LDCONFIG) $(LDCONFIG_FLAGS) "$(DESTDIR)$(PREFIX)/lib/"
endif
endif
$(LN) -sf asterisk "$(DESTDIR)$(ASTSBINDIR)/rasterisk"
-@@ -272,10 +270,7 @@ endif
+@@ -275,10 +276,7 @@ endif
binuninstall:
rm -f "$(DESTDIR)$(ASTSBINDIR)/$(MAIN_TGT)"
rm -f "$(DESTDIR)$(ASTSBINDIR)/rasterisk"