--- asterisk-1.4.0/channels/Makefile.mdv	2006-09-20 18:33:42.000000000 +0200
+++ asterisk-1.4.0/channels/Makefile	2006-09-24 12:35:49.000000000 +0200
@@ -20,8 +20,8 @@
 endif
 
 ifeq ($(OSARCH),linux-gnu)
-  PTLIB=-lpt_linux_x86_r
-  H323LIB=-lh323_linux_x86_r
+  PTLIB=-lpt
+  H323LIB=-lopenh323
   CHANH323LIB=-ldl
 endif
 
@@ -41,11 +41,11 @@
 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)
--- asterisk-1.4.0-beta4/channels/chan_phone.c.mdv	2006-11-28 17:57:16.000000000 +0100
+++ asterisk-1.4.0-beta4/channels/chan_phone.c	2006-12-17 13:59:56.000000000 +0100
@@ -48,7 +48,7 @@
 #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"
--- asterisk-1.4.6/Makefile.mdv	2007-06-29 16:18:36.000000000 +0200
+++ asterisk-1.4.6/Makefile	2007-06-29 23:01:31.000000000 +0200
@@ -113,15 +113,15 @@
   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),)
@@ -157,7 +157,7 @@
 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
 
@@ -370,8 +370,9 @@
 	rm -rf doc/api
 	rm -f build_tools/menuselect-deps
 
-datafiles: _all
-	if [ x`$(ID) -un` = xroot ]; then CFLAGS="$(ASTCFLAGS)" sh 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.
@@ -403,7 +404,7 @@
 NEWHEADERS=$(notdir $(wildcard include/asterisk/*.h))
 OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
 
-bininstall: _all
+bininstall:
 	mkdir -p $(DESTDIR)$(MODULES_DIR)
 	mkdir -p $(DESTDIR)$(ASTSBINDIR)
 	mkdir -p $(DESTDIR)$(ASTETCDIR)
@@ -469,7 +470,7 @@
 		echo " WARNING WARNING WARNING" ;\
 	fi
 
-install: datafiles bininstall $(SUBDIRS_INSTALL)
+install: datafiles bininstall adsi samples webvmail $(SUBDIRS_INSTALL)
 	@if [ -x /usr/sbin/asterisk-post-install ]; then \
 		/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
 	fi
@@ -506,7 +507,7 @@
 		fi ; \
 	done
 
-samples: adsi
+samples:
 	mkdir -p $(DESTDIR)$(ASTETCDIR)
 	for x in configs/*.sample; do \
 		if [ -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \
@@ -554,7 +555,7 @@
 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/; \