diff -ru original/asterisk/Makefile asterisk/Makefile
--- original/asterisk/Makefile	Sat Feb  7 02:13:33 2004
+++ asterisk/Makefile	Wed Feb 18 12:49:04 2004
@@ -102,10 +102,13 @@
 MODULES_DIR=$(ASTLIBDIR)/modules
 AGI_DIR=$(ASTVARLIBDIR)/agi-bin
 
+MARCH=-march=$(PROC)
+#MARCH=-mips2
+
 INCLUDE=-Iinclude -I../include
 CFLAGS=-pipe  -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
 CFLAGS+=$(OPTIMIZE)
-CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
+CFLAGS+=$(shell if $(CC) $(MARCH) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
 CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
 ifeq (${OSARCH},FreeBSD)
 CFLAGS+=-pthread
@@ -143,7 +146,18 @@
 CFLAGS+= $(BUSYDETECT)
 CFLAGS+= $(OPTIONS)
 CFLAGS+=# -fomit-frame-pointer 
-SUBDIRS=res channels pbx apps codecs formats agi cdr astman stdtime
+
+SUBDIRS=res channels pbx apps codecs formats agi
+WANT_CDR=1
+ifeq ($(WANT_CDR),1)
+  SUBDIRS+=cdr
+endif
+WANT_ASTMAN=1
+ifeq ($(WANT_ASTMAN),1)
+  SUBDIRS+=astman
+endif
+SUBDIRS+=stdtime
+
 ifeq (${OSARCH},Linux)
 LIBS=-ldl -lpthread
 endif
@@ -329,8 +343,8 @@
 	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
 	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/keys
 	install -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
-	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -s $(ASTSPOOLDIR)/vm . )
-	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -s $(ASTSPOOLDIR)/voicemail . )
+	cd $(DESTDIR)$(ASTVARLIBDIR)/sounds && ln -s $(ASTSPOOLDIR)/vm .
+	cd $(DESTDIR)$(ASTVARLIBDIR)/sounds && ln -s $(ASTSPOOLDIR)/voicemail .
 	@echo " +---- Asterisk Installation Complete -------+"  
 	@echo " +                                           +"
 	@echo " +    YOU MUST READ THE SECURITY DOCUMENT    +"
@@ -422,7 +436,6 @@
 
 mailbox:
 	./contrib/scripts/addmailbox 
-	
 
 rpm: __rpm
 
@@ -435,7 +448,7 @@
 	cp -f redhat/asterisk /tmp/asterisk/etc/rc.d/init.d/ ; \
 	sed "s/^Version:.*/Version: $(RPMVERSION)/g" redhat/asterisk.spec > asterisk.spec ; \
 	rpmbuild --rcfile /usr/lib/rpm/rpmrc:redhat/rpmrc -bb asterisk.spec
-	
+
 progdocs:
 	doxygen contrib/asterisk-ng-doxygen
 
@@ -447,7 +460,6 @@
 		install -m 755 init.asterisk /etc/init.d/asterisk; \
 	fi 
 
-	
 dont-optimize:
 	$(MAKE) OPTIMIZE= K6OPT= install
 
diff -ru original/asterisk/channels/Makefile asterisk/channels/Makefile
--- original/asterisk/channels/Makefile	Fri Jan 23 15:57:48 2004
+++ asterisk/channels/Makefile	Wed Feb 18 11:26:52 2004
@@ -15,6 +15,8 @@
 
 USE_MYSQL_FRIENDS=0
 
+HOST_CC=$(CC)
+
 CHANNEL_LIBS=chan_modem.so chan_iax.so chan_sip.so \
 	     chan_modem_aopen.so \
              chan_modem_bestdata.so chan_modem_i4l.so \
@@ -86,10 +88,10 @@
 endif
 
 gentone: gentone.c
-	$(CC) -o gentone gentone.c -lm
+	$(HOST_CC) -o gentone gentone.c -lm
 
 gentone-ulaw: gentone-ulaw.c
-	$(CC) -o gentone-ulaw gentone-ulaw.c -lm
+	$(HOST_CC) -o gentone-ulaw gentone-ulaw.c -lm
 
 busy.h: gentone
 	./gentone busy 480 620
diff -ru original/asterisk/codecs/gsm/Makefile asterisk/codecs/gsm/Makefile
--- original/asterisk/codecs/gsm/Makefile	Thu Jan 15 16:31:26 2004
+++ asterisk/codecs/gsm/Makefile	Wed Feb 18 12:03:47 2004
@@ -37,10 +37,12 @@
 ######### ppro's, etc, as well as the AMD K6 and K7.  The compile will
 ######### probably require gcc. 
 
+MARCH=-march=$(PROC)
+
 ifneq (${OSARCH},Darwin)
 ifneq (${PROC},x86_64)
 ifneq ($(shell uname -m),ppc)
-OPTIMIZE+=-march=$(PROC)
+OPTIMIZE+=$(MARCH)
 endif
 endif
 endif
@@ -197,14 +199,19 @@
 		$(SRC)/gsm_option.c	\
 		$(SRC)/short_term.c	\
 		$(SRC)/table.c
+
 ifeq (${OSARCH},Linux)
 ifneq (${PROC},x86_64)
 ifneq ($(shell uname -m),ppc)
-GSM_SOURCES+=	$(SRC)/k6opt.s
+  WANT_K6OPT=1
 endif
 endif
 endif
 
+ifeq ($(WANT_K6OPT),1)
+  GSM_SOURCES+=$(SRC)/k6opt.s
+endif
+
 TOAST_SOURCES = $(SRC)/toast.c 		\
 		$(SRC)/toast_lin.c	\
 		$(SRC)/toast_ulaw.c	\
@@ -248,12 +255,9 @@
 		$(SRC)/gsm_option.o	\
 		$(SRC)/short_term.o	\
 		$(SRC)/table.o
-ifeq (${OSARCH},Linux)
-ifneq (${PROC},x86_64)
-ifneq ($(shell uname -m), ppc)
-GSM_OBJECTS+=	$(SRC)/k6opt.o
-endif
-endif
+
+ifeq ($(WANT_K6OPT),1)
+  GSM_OBJECTS+=$(SRC)/k6opt.o
 endif
 
 TOAST_OBJECTS =	$(SRC)/toast.o 		\
diff -ru original/asterisk/codecs/ilbc/Makefile asterisk/codecs/ilbc/Makefile
--- original/asterisk/codecs/ilbc/Makefile	Sun Apr 27 14:13:11 2003
+++ asterisk/codecs/ilbc/Makefile	Wed Feb 18 11:35:32 2004
@@ -11,8 +11,8 @@
 
 
 $(LIB): $(OBJS)
-	ar cr $(LIB) $(OBJS)
-	ranlib $(LIB)
+	$(AR) cr $(LIB) $(OBJS)
+	$(RANLIB) $(LIB)
 
 clean:
 	rm -f $(LIB) *.o
diff -ru original/asterisk/codecs/lpc10/Makefile asterisk/codecs/lpc10/Makefile
--- original/asterisk/codecs/lpc10/Makefile	Thu Jan  8 11:52:11 2004
+++ asterisk/codecs/lpc10/Makefile	Wed Feb 18 11:50:35 2004
@@ -25,11 +25,13 @@
 CFLAGS = $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC
 #CFLAGS+= $(shell if uname -m | grep -q 86; then echo "-mpentium" ; fi)
 
+MARCH=-march=$(PROC)
+
 #fix for PPC processors
 ifneq ($(OSARCH),Darwin)
 ifneq ($(PROC),ppc)
 ifneq ($(PROC),x86_64)
-	CFLAGS+= -march=$(PROC)
+	CFLAGS+=$(MARCH)
 endif
 endif
 endif
@@ -49,7 +51,7 @@
 
 $(LIB): $(OBJ)
 	$(AR) cr $@ $(OBJ)
-	ranlib $@
+	$(RANLIB) $@
 
 clean:
 	-rm -f *.o $(LIB)
diff -ru original/asterisk/pbx/Makefile asterisk/pbx/Makefile
--- original/asterisk/pbx/Makefile	Sun Oct 26 13:50:49 2003
+++ asterisk/pbx/Makefile	Wed Feb 18 11:34:05 2004
@@ -11,15 +11,19 @@
 # the GNU General Public License
 #
 
-
+WANT_GTK_CONSOLE=1
 
 PBX_LIBS=pbx_config.so pbx_wilcalu.so pbx_spool.so     # pbx_gtkconsole.so pbx_kdeconsole.so
 
 # Add GTK console if appropriate
-PBX_LIBS+=$(shell gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so")
-# Add KDE Console if appropriate
-#PBX_LIBS+=$(shell [ "$$QTDIR" != "" ] && echo "pbx_kdeconsole.so")
+ifeq ($(WANT_GTK_CONSOLE),1)
+  PBX_LIBS+=$(shell gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so")
+endif
 
+# Add KDE Console if appropriate
+ifeq ($(WANT_KDE_CONSOLE),1)
+  PBX_LIBS+=$(shell [ "$$QTDIR" != "" ] && echo "pbx_kdeconsole.so")
+endif
 
 GTK_FLAGS=`gtk-config --cflags gthread`
 GTK_LIBS=`gtk-config --libs gthread`
diff -ru original/asterisk/stdtime/Makefile asterisk/stdtime/Makefile
--- original/asterisk/stdtime/Makefile	Wed Nov  5 01:19:41 2003
+++ asterisk/stdtime/Makefile	Wed Feb 18 11:21:47 2004
@@ -3,8 +3,8 @@
 all: libtime.a
 
 libtime.a: $(OBJS)
-	ar rv $@ $(OBJS)
-	ranlib $@
+	$(AR) rv $@ $(OBJS)
+	$(RANLIB) $@
 
 install: