--- Makefile	2013-04-08 07:08:30.000000000 -0400
+++ Makefile.dlucio	2013-05-14 10:07:50.371950000 -0400
@@ -3,12 +3,12 @@
 
 #ASTPP Configuration
 ASTPPDIR=/var/lib/astpp/
-ASTPPEXECDIR=/usr/local/astpp/
+ASTPPEXECDIR=/usr/share/astpp/
 ASTPPLOGDIR=/var/log/astpp/
-LOCALE_DIR=/usr/local/share/locale
+LOCALE_DIR=/usr/share/locale
 
 #Freeswich Configuration
-FS_DIR=/usr/local/freeswitch
+FS_DIR=/usr/share/freeswitch
 FS_SOUNDSDIR=${FS_DIR}/sounds/en/us/callie
 FS_SCRIPTS=${FS_DIR}/scripts
 
@@ -37,44 +37,39 @@
 	mkdir -p $(DESTDIR)$(ASTPPEXECDIR)	
 	mkdir -p $(DESTDIR)$(WWWDIR)/cgi-bin/astpp-admin	
 	
-	chown $(OWNER) $(DESTDIR)$(ASTPPDIR)
-	chown $(OWNER) $(DESTDIR)$(ASTPPLOGDIR)
-	chown $(OWNER) $(DESTDIR)$(ASTPPEXECDIR)
-	chgrp $(GROUP) $(DESTDIR)$(ASTPPDIR)
-	chgrp $(GROUP) $(DESTDIR)$(ASTPPLOGDIR)
-	chgrp $(GROUP) $(DESTDIR)$(ASTPPEXECDIR)	
-
 #ASTPP scripts installation function
 install_astpp_scripts:
 	for x in scripts/*.pl; do \
 		echo $$x; \
-		install -m 755 -o $(OWNER) -g $(GROUP) $$x $(PREFIX)$(ASTPPEXECDIR); \
+		install -m 755  $$x $(DESTDIR)$(PREFIX)$(ASTPPEXECDIR); \
 	done
 
 #ASTPP config file installation function	
 install_astpp_config:
-	install -m 644 -o $(OWNER) -g $(GROUP) astpp_confs/sample.astpp-config.conf $(DESTDIR)$(ASTPPDIR)/astpp-config.conf
-	install -m 644 -o $(OWNER) -g $(GROUP) astpp_confs/sample.reseller-config.conf $(DESTDIR)$(ASTPPDIR)/sample.reseller-config.conf
+	install -m 644 astpp_confs/sample.astpp-config.conf $(DESTDIR)$(ASTPPDIR)/astpp-config.conf
+	install -m 644 astpp_confs/sample.reseller-config.conf $(DESTDIR)$(ASTPPDIR)/sample.reseller-config.conf
 
 #ASTPP GUI installation function
 install_astpp_gui:
-	mkdir -p $(DESTDIR)$(WWWDIR)/html/astpp
-	chgrp $(GROUP) $(DESTDIR)$(WWWDIR)/html/astpp
+	mkdir -p $(DESTDIR)$(WWWDIR)/astpp
+	mkdir -p $(DESTDIR)$(APACHE)/conf/sites.d
 	
-	cp -Rf web_interface/astpp/* $(DESTDIR)$(WWWDIR)/html/astpp/
-	install -m 755 -o $(OWNER) -g $(GROUP) web_interface/astpp/htaccess $(DESTDIR)$(WWWDIR)/html/astpp/.htaccess
-	install -m 755 -o $(OWNER) -g $(GROUP) web_interface/astpp-wraper.cgi $(DESTDIR)$(WWWDIR)/cgi-bin/astpp-admin/astpp-wraper.cgi
-	install -m 755 -o $(OWNER) -g $(GROUP) web_interface/apache/astpp.conf $(APACHE)/conf.d/astpp.conf
+	cp -Rf web_interface/astpp/* $(DESTDIR)$(WWWDIR)/astpp/
+	install -m 755 web_interface/astpp/htaccess $(DESTDIR)$(WWWDIR)/astpp/.htaccess
+	install -m 755 web_interface/astpp-wraper.cgi $(DESTDIR)$(WWWDIR)/cgi-bin/astpp-admin/astpp-wraper.cgi
+	install -m 755 web_interface/apache/astpp.conf $(DESTDIR)$(APACHE)/conf/sites.d/astpp.conf
 
 #Freeswitch scripts installation function
 install_freeswitch_scripts:
-	install -m 755 -o $(OWNER) -g $(GROUP) freeswitch/astpp-fs-xml.pl $(DESTDIR)$(WWWDIR)/cgi-bin/astpp-fs-xml.cgi
-	install -m 755 -o $(OWNER) -g $(GROUP) freeswitch/astpp-fs-cdr-xml.pl $(DESTDIR)$(WWWDIR)/cgi-bin/astpp-fs-cdr-xml.cgi
-	
-	install -m 755 -o $(OWNER) -g $(GROUP) freeswitch/astpp-callingcards.pl ${FS_SCRIPTS}/astpp-callingcards.pl
+	mkdir -p  $(DESTDIR)${FS_SCRIPTS}
+	mkdir -p  $(DESTDIR)$(WWWDIR)/cgi-bin
+	install -m 755 freeswitch/astpp-fs-xml.pl $(DESTDIR)$(WWWDIR)/cgi-bin/astpp-fs-xml.cgi
+	install -m 755 freeswitch/astpp-fs-cdr-xml.pl $(DESTDIR)$(WWWDIR)/cgi-bin/astpp-fs-cdr-xml.cgi
+	install -m 755 freeswitch/astpp-callingcards.pl $(DESTDIR)${FS_SCRIPTS}/astpp-callingcards.pl
 
 #Freeswitch sounds installation function
 install_freeswitch_sounds:
+	mkdir -p  $(DESTDIR)$(FS_SOUNDSDIR)
 	for x in sounds/*.wav; do \
 		echo $$x;\
 		install -m 644 $$x $(DESTDIR)$(FS_SOUNDSDIR); \
@@ -94,7 +89,7 @@
 
 #Asterisk config installation function	
 install_asterisk_config:
-	install -m 644 -o $(OWNER) -g $(GROUP) asterisk/confs/sample.astpp-dialplan.conf $(DESTDIR)$(ASTERISKDIR)/astpp-dialplan.conf
+	install -m 644 asterisk/confs/sample.astpp-dialplan.conf $(DESTDIR)$(ASTERISKDIR)/astpp-dialplan.conf
 
 #Asterisk sounds installation function
 install_asterisk_sounds:
@@ -107,7 +102,7 @@
 install_asterisk_agi:
 	for x in asterisk/agi/*.agi; do \
 		echo $$x; \
-		install -m 755 -o $(OWNER) -g $(GROUP) $$x $(PREFIX)$(AGIDIR); \
+		install -m 755 $$x $(PREFIX)$(AGIDIR); \
 	done
 
 #Asterisk instruction print function