Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv13904
Modified Files:
ChangeLog Makefile
Log Message:
issue #5633
Index: ChangeLog
===================================================================
RCS file: /usr/cvsroot/asterisk/ChangeLog,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- ChangeLog 8 Nov 2005 00:06:09 -0000 1.49
+++ ChangeLog 8 Nov 2005 00:08:09 -0000 1.50
@@ -1,5 +1,7 @@
2005-11-07 Kevin P. Fleming <[EMAIL PROTECTED]>
+ * Makefile: various fixes from issue #5633
+
* apps/app_osplookup.c: upgrade to new arg/option API and implement
priority jumping control
* channels/chan_misdn.c: various fixes from issue #5639
Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/Makefile,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -d -r1.220 -r1.221
--- Makefile 7 Nov 2005 22:33:12 -0000 1.220
+++ Makefile 8 Nov 2005 00:08:09 -0000 1.221
@@ -89,7 +89,9 @@
# Files are copied here temporarily during the install process
# For example, make DESTDIR=/tmp/asterisk woud put things in
# /tmp/asterisk/etc/asterisk
-DESTDIR=
+# XXX watch out, put no spaces or comments after the value
+DESTDIR?=
+#DESTDIR?=/tmp/asterisk
# Original busydetect routine
BUSYDETECT = #-DBUSYDETECT
@@ -249,6 +251,22 @@
ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/spandsp
endif
MPG123TARG=freebsd
+
+ # XXX FreeBSD paths
+ PREFIX?=/usr/local
+ ASTLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/lib/asterisk
+ ASTVARLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/share/asterisk
+ ASTETCDIR=$(INSTALL_PREFIX)$(PREFIX)/etc/asterisk
+ ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
+ ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
+ ASTHEADERDIR=$(INSTALL_PREFIX)$(PREFIX)/include/asterisk
+ ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
+ ASTBINDIR=$(INSTALL_PREFIX)$(PREFIX)/bin
+ ASTSBINDIR=$(INSTALL_PREFIX)$(PREFIX)/sbin
+ ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
+ ASTMANDIR=$(INSTALL_PREFIX)$(PREFIX)/man
+ # XXX end FreeBSD paths
+
endif # FreeBSD
ifeq ($(OSARCH),NetBSD)
@@ -717,22 +735,24 @@
fi ; \
$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x
.sample` ;\
done
- if [ "$(OVERWRITE)" = "y" ] || [ ! -f
$(DESTDIR)$(ASTETCDIR)/asterisk.conf ]; then \
- echo "[directories]" > $(DESTDIR)$(ASTETCDIR)/asterisk.conf ; \
- echo "astetcdir => $(ASTETCDIR)" >>
$(DESTDIR)$(ASTETCDIR)/asterisk.conf ; \
- echo "astmoddir => $(MODULES_DIR)" >>
$(DESTDIR)$(ASTETCDIR)/asterisk.conf ; \
- echo "astvarlibdir => $(ASTVARLIBDIR)" >>
$(DESTDIR)$(ASTETCDIR)/asterisk.conf ; \
- echo "astagidir => $(AGI_DIR)" >>
$(DESTDIR)$(ASTETCDIR)/asterisk.conf ; \
- echo "astspooldir => $(ASTSPOOLDIR)" >>
$(DESTDIR)$(ASTETCDIR)/asterisk.conf ; \
- echo "astrundir => $(ASTVARRUNDIR)" >>
$(DESTDIR)$(ASTETCDIR)/asterisk.conf ; \
- echo "astlogdir => $(ASTLOGDIR)" >>
$(DESTDIR)$(ASTETCDIR)/asterisk.conf ; \
- echo "" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf ; \
- echo "; Changing the following lines may compromise your
security." >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf ; \
- echo ";[files]" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf ; \
- echo ";astctlpermissions = 0660" >>
$(DESTDIR)$(ASTETCDIR)/asterisk.conf ; \
- echo ";astctlowner = root" >>
$(DESTDIR)$(ASTETCDIR)/asterisk.conf ; \
- echo ";astctlgroup = apache" >>
$(DESTDIR)$(ASTETCDIR)/asterisk.conf ; \
- echo ";astctl = asterisk.ctl" >>
$(DESTDIR)$(ASTETCDIR)/asterisk.conf ; \
+ if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \
+ ( \
+ echo "[directories]" ; \
+ echo "astetcdir => $(ASTETCDIR)" ; \
+ echo "astmoddir => $(MODULES_DIR)" ; \
+ echo "astvarlibdir => $(ASTVARLIBDIR)" ; \
+ echo "astagidir => $(AGI_DIR)" ; \
+ echo "astspooldir => $(ASTSPOOLDIR)" ; \
+ echo "astrundir => $(ASTVARRUNDIR)" ; \
+ echo "astlogdir => $(ASTLOGDIR)" ; \
+ echo "" ; \
+ echo "; Changing the following lines may compromise your
security." ; \
+ echo ";[files]" ; \
+ echo ";astctlpermissions = 0660" ; \
+ echo ";astctlowner = root" ; \
+ echo ";astctlgroup = apache" ; \
+ echo ";astctl = asterisk.ctl" ; \
+ ) > $(DESTDIR)$(ASTCONFPATH) ; \
else \
echo "Skipping asterisk.conf creation"; \
fi
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
