diff -urw asterisk-1.0.9.orig/apps/Makefile asterisk-1.0.9/apps/Makefile
--- asterisk-1.0.9.orig/apps/Makefile	2004-09-24 23:32:56.000000000 +0200
+++ asterisk-1.0.9/apps/Makefile	2005-08-16 13:40:25.000000000 +0200
@@ -39,11 +39,10 @@
 #APPS+=app_sql_odbc.so
 #APPS+=app_rpt.so
 
-APPS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
-APPS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
+APPS+=$(shell if [ -f $(DESTDIR)/etc/zaptel.conf ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
 APPS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "app_osplookup.so" ; fi)
 
-CFLAGS+=-fPIC
+CFLAGS+=-fPIC $(EXTRA_CFLAGS)
 
 ifeq ($(USE_POSTGRES_VM_INTERFACE),1)
 CFLAGS+=-DUSEPOSTGRESVM
diff -urw asterisk-1.0.9.orig/Makefile asterisk-1.0.9/Makefile
--- asterisk-1.0.9.orig/Makefile	2005-04-26 16:30:23.000000000 +0200
+++ asterisk-1.0.9/Makefile	2005-08-16 13:33:58.000000000 +0200
@@ -19,7 +19,7 @@
 OSARCH=$(shell uname -s)
 
 ifeq (${OSARCH},Linux)
-PROC=$(shell uname -m)
+PROC=$(shell $(CC) -dumpmachine | cut -d- -f1)
 ifeq ($(PROC),x86_64)
 # You must have GCC 3.4 to use k8, otherwise use athlon
 PROC=k8
@@ -97,7 +97,7 @@
 # Files are copied here temporarily during the install process
 # For example, make DESTDIR=/tmp/asterisk woud put things in
 # /tmp/asterisk/etc/asterisk
-DESTDIR=
+DESTDIR?=
 
 # Original busydetect routine
 BUSYDETECT = #-DBUSYDETECT
@@ -134,10 +134,13 @@
 CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
 endif
 
-CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
+ifeq ($(PROC), powerpc)
+CFLAGS+=-fsigned-char
+endif
+
 CFLAGS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "-DOSP_SUPPORT -I/usr/include/osp" ; fi)
 
-ifeq (${OSARCH},FreeBSD)
+ifeq ($(OSARCH),FreeBSD)
 OSVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
 CFLAGS+=$(shell if test ${OSVERSION} -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
 LIBS+=$(shell if test  ${OSVERSION} -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
@@ -159,13 +162,12 @@
 #Uncomment this to use the older DSP routines
 #CFLAGS+=-DOLD_DSP_ROUTINES
 
-CFLAGS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi)
-CFLAGS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi)
+CFLAGS+=$(shell if [ -f $(DESTDIR)/etc/zaptel.conf ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi)
 
 LIBEDIT=editline/libedit.a
 
 ASTERISKVERSION=$(shell if [ -f .version ]; then cat .version; else if [ -d CVS ]; then if [ -f CVS/Tag ] ; then echo "CVS-`sed 's/^T//g' CVS/Tag`-`date +"%D-%T"`"; else echo "CVS-HEAD-`date +"%D-%T"`"; fi; fi; fi)
-HTTPDIR=$(shell if [ -d /var/www ]; then echo "/var/www"; else echo "/home/httpd"; fi)
+HTTPDIR=$(shell if [ -d $(DESTDIR)/var/www ]; then echo "/var/www"; else echo "/home/httpd"; fi)
 RPMVERSION=$(shell if [ -f .version ]; then sed 's/[-\/:]/_/g' .version; else echo "unknown" ; fi)
 CFLAGS+=-DASTERISK_VERSION=\"$(ASTERISKVERSION)\"
 CFLAGS+=-DINSTALL_PREFIX=\"$(INSTALL_PREFIX)\"
@@ -366,6 +368,14 @@
 		echo "Not CVS";  \
 	fi
 
+incinstall:
+	install -d $(DESTDIR)$(ASTHEADERDIR)
+	install -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
+
+maninstall:
+	mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
+	install -m 644 asterisk.8.gz $(DESTDIR)$(ASTMANDIR)/man8
+
 bininstall: all
 	mkdir -p $(DESTDIR)$(MODULES_DIR)
 	mkdir -p $(DESTDIR)$(ASTSBINDIR)
@@ -382,8 +392,6 @@
 		install -m 755 contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\
 	fi
 	for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done
-	install -d $(DESTDIR)$(ASTHEADERDIR)
-	install -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
 	rm -f $(DESTDIR)$(ASTVARLIBDIR)/sounds/vm
 	rm -f $(DESTDIR)$(ASTVARLIBDIR)/sounds/voicemail
 	if [ ! -h $(DESTDIR)$(ASTSPOOLDIR)/vm ] && [ -d $(DESTDIR)$(ASTSPOOLDIR)/vm ]; then \
@@ -398,10 +406,8 @@
 	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
 	if [ -d contrib/firmware/iax ]; then \
 		install -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \
 	else \
@@ -446,6 +452,8 @@
 
 
 install: all datafiles bininstall
+	@echo "Binary installation done. Run make-targets incinstall and"
+	@echo "maninstall for includes and manual pages respectively."
 
 upgrade: all bininstall
 
Only in asterisk-1.0.9: Makefile.orig