--- Makefile	2007-12-13 19:48:30.000000000 +0100
+++ Makefile.new	2008-05-01 12:12:18.000000000 +0200
@@ -16,6 +16,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
@@ -78,7 +80,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`"
@@ -86,13 +88,12 @@
 
 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"
--- create_config.sh	2007-12-13 19:48:30.000000000 +0100
+++ create_config.sh.new	2008-05-01 11:48:52.000000000 +0200
@@ -54,19 +54,8 @@
 
 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 [ "$REALTIME_USEABLE" = "1" ]
 then