diff -Naurp asterisk-1.4.21/channels/chan_phone.c asterisk-1.4.21.oden/channels/chan_phone.c
--- asterisk-1.4.21/channels/chan_phone.c	2008-03-05 17:32:10.000000000 -0500
+++ asterisk-1.4.21.oden/channels/chan_phone.c	2008-06-19 08:37:44.000000000 -0400
@@ -51,7 +51,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
 #include <linux/telephony.h>
 /* Still use some IXJ specific stuff */
 #include <linux/version.h>
-#include <linux/ixjuser.h>
+#include "linux/ixjuser.h"
 
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
diff -Naurp asterisk-1.4.21/channels/Makefile asterisk-1.4.21.oden/channels/Makefile
--- asterisk-1.4.21/channels/Makefile	2008-03-11 16:48:58.000000000 -0400
+++ asterisk-1.4.21.oden/channels/Makefile	2008-06-19 08:37:44.000000000 -0400
@@ -26,8 +26,8 @@ ifeq ($(OSARCH),OpenBSD)
 endif
 
 ifeq ($(OSARCH),linux-gnu)
-  PTLIB=-lpt_linux_x86_r
-  H323LIB=-lh323_linux_x86_r
+  PTLIB=-lpt
+  H323LIB=-lopenh323
   CHANH323LIB=-ldl
 endif
 
@@ -47,11 +47,11 @@ ifeq ($(wildcard h323/libchanh323.a),)
 endif
 
 ifndef OPENH323DIR
-  OPENH323DIR=$(HOME)/openh323
+  OPENH323DIR=/usr/share/openh323
 endif
 
 ifndef PWLIBDIR
-  PWLIBDIR=$(HOME)/pwlib
+  PWLIBDIR=/usr/share/pwlib
 endif
 
 LOADABLE_MODS:=$(C_MODS) $(CC_MODS)
diff -Naurp asterisk-1.4.21/Makefile asterisk-1.4.21.oden/Makefile
--- asterisk-1.4.21/Makefile	2008-05-05 16:17:55.000000000 -0400
+++ asterisk-1.4.21.oden/Makefile	2008-06-19 08:39:05.000000000 -0400
@@ -123,15 +123,15 @@ else
   ASTHEADERDIR=$(includedir)/asterisk
   ASTBINDIR=$(bindir)
   ASTSBINDIR=$(sbindir)
-  ASTSPOOLDIR=$(localstatedir)/spool/asterisk
-  ASTLOGDIR=$(localstatedir)/log/asterisk
-  ASTVARRUNDIR=$(localstatedir)/run
+  ASTSPOOLDIR=/var/spool/asterisk
+  ASTLOGDIR=/var/log/asterisk
+  ASTVARRUNDIR=/var/run
   ASTMANDIR=$(mandir)
 ifneq ($(findstring BSD,$(OSARCH)),)
   ASTVARLIBDIR=$(prefix)/share/asterisk
   ASTVARRUNDIR=$(localstatedir)/run/asterisk
 else
-  ASTVARLIBDIR=$(localstatedir)/lib/asterisk
+  ASTVARLIBDIR=/var/lib/asterisk
 endif
 endif
 ifeq ($(ASTDATADIR),)
@@ -167,7 +167,7 @@ OTHER_SUBDIR_CFLAGS=-I$(ASTTOPDIR)/inclu
 ifeq ($(OSARCH),linux-gnu)
   ifeq ($(PROC),x86_64)
     # You must have GCC 3.4 to use k8, otherwise use athlon
-    PROC=k8
+    #PROC=k8
     #PROC=athlon
   endif
 
@@ -409,10 +409,9 @@
 	rm -rf doc/api
 	rm -f build_tools/menuselect-deps
 
-datafiles: _all
-	if [ `$(ID) -u` = 0 ]; then \
-		CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; \
-	fi
+datafiles:
+	mkdir -p $(DESTDIR)/usr/lib/pkgconfig
+	CFLAGS="$(ASTCFLAGS)" sh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig
 # Should static HTTP be installed during make samples or even with its own target ala
 # webvoicemail?  There are portions here that *could* be customized but might also be
 # improved a lot.  I'll put it here for now.
@@ -445,7 +446,7 @@ installdirs:
 	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme
 	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor
 
-bininstall: _all installdirs $(SUBDIRS_INSTALL)
+bininstall: installdirs $(SUBDIRS_INSTALL)
 	$(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/
 	$(LN) -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk
 	$(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
@@ -507,7 +508,7 @@ ifneq ($(findstring ~,$(DESTDIR)),)
 	@exit 1
 endif
 
-install: badshell datafiles bininstall
+install: badshell datafiles bininstall adsi samples webvmail
 	@if [ -x /usr/sbin/asterisk-post-install ]; then \
 		/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
 	fi
@@ -552,7 +553,7 @@ adsi:
 		fi ; \
 	done
 
-samples: adsi
+samples:
 	mkdir -p $(DESTDIR)$(ASTETCDIR)
 	for x in configs/*.sample; do \
 		if [ -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \
@@ -624,7 +625,7 @@ samples: adsi
 webvmail:
 	@[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 )
 	@[ -d $(DESTDIR)$(HTTP_CGIDIR) ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 )
-	$(INSTALL) -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi
+	$(INSTALL) -m 4755 contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi
 	mkdir -p $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk
 	for x in images/*.gif; do \
 		$(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \