--- chan_sccp-20051118/Makefile.orig	2005-11-18 18:22:38.000000000 +0000
+++ chan_sccp-20051118/Makefile	2005-11-20 23:05:00.000000000 +0000
@@ -17,6 +17,8 @@
 INSTALL_PREFIX=
 ASTERISK_HEADER_DIR=$(INSTALL_PREFIX)/usr/include
 
+AST_CFG=/usr/bin/asterisk-config
+
 ifeq (${OSNAME},FreeBSD)
 ASTERISK_HEADER_DIR=$(INSTALL_PREFIX)/usr/local/include
 endif
@@ -37,9 +39,8 @@
 
 DEBUG=-ggdb #-include $(ASTERISK_HEADER_DIR)/asterisk/astmm.h
 
-DEFINE=-Iinclude -D_REENTRANT -D_GNU_SOURCE  -O  -DCRYPTO -fPIC
-CFLAG= -pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
-CFLAG+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo " -march=$(PROC)"; fi)
+DEFINE=-Iinclude -D_REENTRANT -D_GNU_SOURCE -O -DCRYPTO -fPIC
+CFLAG+= -pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
 CFLAG+=$(shell if uname -m | grep -q ppc; then echo " -fsigned-char"; fi)
 #CFLAG+= -pedantic
 #CFLAG+= -W
@@ -69,7 +70,7 @@
 FLS+=sccp_socket
 FLS+=sccp_indicate
 
-CFLAGS+=$(DEFINE) $(CFLAG) -I$(ASTERISK_HEADER_DIR)
+CFLAGS+=$(DEFINE) $(CFLAG)
 HEADERS=$(shell for i in $(FLS) ; do echo $$i.h ; done)
 OBJECTS=$(shell for i in $(FLS) ; do echo .tmp/$$i.o ; done)
 SOURCES=$(shell for i in $(FLS) ; do echo $$i.c ; done)
@@ -80,7 +81,7 @@
 
 chan_sccp.so: .config .tmp $(OBJECTS) $(HEADERS) $(SOURCES)
 	@echo "Linking chan_sccp.so"
-	@$(CC) $(LINK_OPT) -o chan_sccp.so $(OBJECTS)
+	@$(CC) $(shell $(AST_CFG) --solink) -o chan_sccp.so $(OBJECTS)
 
 .tmp/%.o: $(HEADERS)
 	@printf "Now compiling .... %-15s\t%s lines \n" $*.c "`wc -l <$*.c`"
@@ -84,18 +85,14 @@
 
 all: chan_sccp.so
 
-install: chan_sccp.so
+install:
 	@echo "Now Installing chan_sccp.so"
-	@install -m 755 chan_sccp.so $(AST_MODULES_DIR);
+	@install -D -m 755 chan_sccp.so $(AST_MODULES_DIR)/chan_sccp.so;
 	@if ! [ -f $(INSTALL_PREFIX)/etc/asterisk/sccp.conf ]; then \
 		echo "Installing config file $(INSTALL_PREFIX)/etc/asterisk/sccp.conf"; \
 		mkdir -p $(INSTALL_PREFIX)/etc/asterisk; \
 		cp conf/sccp.conf $(INSTALL_PREFIX)/etc/asterisk/; \
 	fi
-	@echo "Chan_sccp is now installed"
-	@echo "Remember to disable chan_skinny by adding the following"
-	@echo "line to /etc/asterisk/modules.conf:"
-	@echo "noload => chan_skinny.so"
 
 clean:
 	rm -rf config.h chan_sccp.so .tmp
--- chan_sccp-20051118/create_config.sh.orig	2005-11-18 18:22:38.000000000 +0000
+++ chan_sccp-20051118/create_config.sh	2005-11-20 23:05:00.000000000 +0000
@@ -38,20 +38,8 @@
 echo "#define CHAN_SCCP_CONFIG_H" >>$CONFIGFILE
 echo >>$CONFIGFILE
 
-echo -n "Build PARK functions (y/n)[n]?"
-read key
-if [ "$key" = "y" ]
-then
-	echo "#define CS_SCCP_PARK"  >>$CONFIGFILE
-fi
-
-echo -n "Build PICKUP functions (y/n)[n]?"
-read key
-if [ "$key" = "y" ]
-then
-        echo "#define CS_SCCP_PICKUP"  >>$CONFIGFILE
-fi
-
+echo "#define CS_SCCP_PARK"  >>$CONFIGFILE
+echo "#define CS_SCCP_PICKUP"  >>$CONFIGFILE
 
 if grep -q "struct ast_channel_tech" $INCLUDEDIR/channel.h; then
 	echo "#define CS_AST_HAS_TECH_PVT" >>$CONFIGFILE