--- Makefile.orig	2007-08-24 17:56:49.000000000 -0400
+++ Makefile	2007-08-25 11:25:29.000000000 -0400
@@ -81,6 +81,11 @@
 
 ASTTOPDIR:=$(shell pwd)
 
+PIKADIR:=$(shell cd ../../../;pwd)
+#PIKADIR:=/tmp/blah
+HEADERDIR:=/usr/include
+
+
 # Overwite config files on "make samples"
 OVERWRITE=y
 
@@ -108,20 +113,21 @@
   ASTVARRUNDIR=/var/run/asterisk
   ASTMANDIR=/opt/asterisk/man
 else
-  ASTETCDIR=$(sysconfdir)/asterisk
-  ASTLIBDIR=$(libdir)/asterisk
-  ASTHEADERDIR=$(includedir)/asterisk
-  ASTBINDIR=$(bindir)
-  ASTSBINDIR=$(sbindir)
-  ASTSPOOLDIR=$(localstatedir)/spool/asterisk
-  ASTLOGDIR=$(localstatedir)/log/asterisk
-  ASTVARRUNDIR=$(localstatedir)/run
+  ASTETCDIR=$(PIKADIR)/etc/asterisk
+  ASTLIBDIR=$(PIKADIR)/usr/lib/asterisk
+  HEADERDIR:=$(PIKADIR)/usr/include
+  ASTHEADERDIR=$(PIKADIR)/usr/include/asterisk
+  ASTBINDIR=$(PIKADIR)/usr/bin
+  ASTSBINDIR=$(PIKADIR)/usr/sbin
+  ASTSPOOLDIR=$(PIKADIR)/var/spool/asterisk
+  ASTLOGDIR=$(PIKADIR)/var/log/asterisk
+  ASTVARRUNDIR=$(PIKADIR)/var/run
   ASTMANDIR=$(mandir)
 ifneq ($(findstring BSD,$(OSARCH)),)
   ASTVARLIBDIR=$(prefix)/share/asterisk
   ASTVARRUNDIR=$(localstatedir)/run/asterisk
 else
-  ASTVARLIBDIR=$(localstatedir)/lib/asterisk
+  ASTVARLIBDIR=$(PIKADIR)/var/lib/asterisk
 endif
 endif
 ifeq ($(ASTDATADIR),)
@@ -428,7 +434,7 @@
 		chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
 	fi
 	$(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)
-	$(INSTALL) -m 644 include/asterisk.h $(DESTDIR)$(includedir)
+	$(INSTALL) -m 644 include/asterisk.h $(DESTDIR)$(HEADERDIR)
 	$(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
 	if [ -n "$(OLDHEADERS)" ]; then \
 		rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
@@ -438,13 +444,13 @@
 	mkdir -p $(DESTDIR)$(ASTDATADIR)/keys
 	mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
 	mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
-	mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
+	#mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
 	$(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
 	$(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
-	$(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
-	$(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
-	$(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
-	$(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
+	#$(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
+	#$(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
+	#$(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
+	#$(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
 	if [ -f contrib/firmware/iax/iaxy.bin ] ; then \
 		$(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \
 	fi
@@ -538,14 +544,14 @@
 	if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \
 		( \
 		echo "[directories]" ; \
-		echo "astetcdir => $(ASTETCDIR)" ; \
-		echo "astmoddir => $(MODULES_DIR)" ; \
-		echo "astvarlibdir => $(ASTVARLIBDIR)" ; \
-		echo "astdatadir => $(ASTDATADIR)" ; \
-		echo "astagidir => $(AGI_DIR)" ; \
-		echo "astspooldir => $(ASTSPOOLDIR)" ; \
-		echo "astrundir => $(ASTVARRUNDIR)" ; \
-		echo "astlogdir => $(ASTLOGDIR)" ; \
+		echo "astetcdir => /etc/asterisk" ; \
+		echo "astmoddir => /usr/lib/asterisk/modules" ; \
+		echo "astvarlibdir => /var/lib/asterisk" ; \
+		echo "astdatadir => /var/lib/asterisk" ; \
+		echo "astagidir => /var/lib/asterisk/agi-bin" ; \
+		echo "astspooldir => /var/spool/asterisk" ; \
+		echo "astrundir => /var/run" ; \
+		echo "astlogdir => /var/log/asterisk" ; \
 		echo "" ; \
 		echo ";[options]" ; \
 		echo ";internal_timing = yes" ; \