Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/Makefile,v
retrieving revision 1.101
diff -u -r1.101 Makefile
--- Makefile	18 Jul 2004 17:58:05 -0000	1.101
+++ Makefile	19 Jul 2004 10:56:37 -0000
@@ -372,6 +377,7 @@
 	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/keys
 	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware
 	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax
+	mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
 	install -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
 	install -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
 	install -m 644 asterisk.8.gz $(DESTDIR)$(ASTMANDIR)/man8
Index: frame.c
===================================================================
RCS file: /usr/cvsroot/asterisk/frame.c,v
retrieving revision 1.35
diff -u -r1.35 frame.c
--- frame.c	22 Jun 2004 20:11:15 -0000	1.35
+++ frame.c	19 Jul 2004 10:56:45 -0000
@@ -136,6 +136,9 @@
 	int len;
 	/* IF we have an optimization frame, send it */
 	if (s->opt) {
+		if (s->opt->offset < AST_FRIENDLY_OFFSET)
+			ast_log(LOG_WARNING, "Returning a frame of inappropriate offset (%d).",
+							s->opt->offset);
 		opt = s->opt;
 		s->opt = NULL;
 		return opt;
Index: codecs/Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- codecs/Makefile	2 Jul 2004 23:11:13 -0000	1.23
+++ codecs/Makefile	19 Jul 2004 10:57:33 -0000
@@ -86,7 +86,9 @@
 %.so : %.o
 	$(CC) $(SOLINK) -o $@ $<
 
+ifneq ($(wildcard .depend),)
 include .depend
+endif
 
 install: all
 	for x in $(CODECS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done