[Astpp-commit] SF.net SVN: astpp:[2241] trunk/Makefile

[<dar...@us...>]

Revision: 2241
          http://astpp.svn.sourceforge.net/astpp/?rev=2241&view=rev
Author:   darrenkw
Date:     2009-03-10 00:52:26 +0000 (Tue, 10 Mar 2009)

Log Message:
-----------
Worked on removing Asterisk dependencies if installing for Freeswitch.

Modified Paths:
--------------
    trunk/Makefile

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2009-03-07 22:38:22 UTC (rev 2240)
+++ trunk/Makefile	2009-03-10 00:52:26 UTC (rev 2241)
@@ -21,7 +21,7 @@
 GROUP=wheel
 WWWDIR=/var/www
 
-all:
+all: install
 
 install_misc:
 		mkdir -p $(DESTDIR)$(ASTPPDIR)
@@ -48,12 +48,22 @@
 		install -m 755 -o $(OWNER) -g $(GROUP) web_interface/astpp-users.cgi $(DESTDIR)$(WWWDIR)/cgi-bin/astpp/astpp-users.cgi
 		install -m 644 -o $(OWNER) -g $(GROUP) web_interface/style.css $(DESTDIR)$(WWWDIR)/html/_astpp/
 		install -m 644 -o $(OWNER) -g $(GROUP) web_interface/menu.js $(DESTDIR)$(WWWDIR)/html/_astpp/
+
 		# Install Sample Configuration Files
 #		install -m 644 -o $(OWNER) -g $(GROUP) ./samples/sample.reseller-config.conf $(DESTDIR)$(ASTPPDIR)/sample.reseller-config.conf
 		install -m 644 -o $(OWNER) -g $(GROUP) ./samples/sample.astpp-config.conf $(DESTDIR)$(ASTPPDIR)/sample.astpp-config.conf
 #		install -m 644 -o $(OWNER) -g $(GROUP) ./samples/sample.astpp-enh-config.conf $(DESTDIR)$(ASTPPDIR)/sample.astpp-enh-config.conf
+
+install_asterisk_config:
 		install -m 644 -o $(OWNER) -g $(GROUP) ./samples/sample.astpp-dialplan.conf $(DESTDIR)$(ASTERISKDIR)/sample.astpp-dialplan.conf
 
+install_freeswitch_config:
+	@echo "--------------------";
+	@echo "Sample Freeswitch configuration files live in";
+	@echo "./freeswitch/conf.  You will need to modify your";
+	@echo "files to be similar to those.";
+	@echo "--------------------";
+
 install_samples:
 	install -m 644 -o $(OWNER) -g $(GROUP) ./samples/sample.reseller-config.conf $(DESTDIR)$(ASTPPDIR)/sample.reseller-config.conf
 	install -m 644 -o $(OWNER) -g $(GROUP) ./samples/sample.astpp-config.conf $(DESTDIR)$(ASTPPDIR)/astpp-config.conf
@@ -78,13 +88,13 @@
 		install -m 755 -o $(OWNER) -g $(GROUP) $$x $(PREFIX)$(ASTPPEXECDIR); \
 	done
 
-install_sounds:
+install_sounds_asterisk:
 	for x in sounds/*.gsm; do \
 		echo $$x;\
 		install -m 644 $$x $(DESTDIR)$(SOUNDSDIR); \
 	done
 
-install_sounds_fs:
+install_sounds_freeswitch:
 	for x in sounds/*.gsm; do \
 		echo $$x;\
 		install -m 644 $$x $(DESTDIR)$(FS_SOUNDSDIR); \
@@ -161,11 +171,23 @@
 	@echo "to change the 'auth' code as well as set more advanced features."
 	@echo "";
 	@echo "'make install' updates all the sample files which have been installed but to overwrite any settings you have in place";
-	@echo "perform a 'make samples'.  Be aware that this will overwrite any astpp settings you may have as well as replace";
+	@echo "If this is the first time you are installing ASTPP you need to perform a 'make samples'. ";
+	@echo "Be aware that this will overwrite any astpp settings you may have as well as replace";
 	@echo "your astpp-dialplan.conf file.";
 	@echo "";
 	@echo "Thank you for using ASTPP!  Please visit www.astpp.org for support information.";
 
-install: all install_misc install_astpp_exec install_agi install_instructions_print
+install_all_pre: install_misc install_astpp_exec
+install_all_post: install_instructions_print
 
-samples: install_images install_sounds install_templates install_samples
+install_asterisk: install_all_pre install_asterisk_config install_sounds_asterisk install_agi install_all_post
+install_freeswitch: install_all_pre install_freeswitch_config install_sounds_freeswitch install_all_post
+
+samples: install_images install_templates install_samples
+
+install:
+	@echo "------------------------------";
+	@echo "Please use 'make install_asterisk if you are using Asterisk";
+	@echo "Please use 'make install_freeswitch you are using Freeswitch";
+	@echo "------------------------------";
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.