bkruse: branch 2.0 r3726 - /branches/2.0/Makefile

[SVN commits to the Asterisk-GUI project]

Author: bkruse
Date: Fri Aug 29 15:27:48 2008
New Revision: 3726

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=3726
Log:
This should work for most any case. At worst you have
http://localhost//asterisk/static/config/index.html which
will still work

Modified:
    branches/2.0/Makefile

Modified: branches/2.0/Makefile
URL: http://svn.digium.com/view/asterisk-gui/branches/2.0/Makefile?view=diff&rev=3726&r1=3725&r2=3726
==============================================================================
--- branches/2.0/Makefile (original)
+++ branches/2.0/Makefile Fri Aug 29 15:27:48 2008
@@ -90,13 +90,13 @@
 ifeq ($(HTTPBINDPORT),)
   HTTPBINDPORT:=8088
 endif
-HTTPPREFIXBASE?=$(shell cat $(ASTETCDIR)/http.conf  2>/dev/null | grep -v ^\; | grep prefix )
+HTTPPREFIXBASE?=$(shell cat $(ASTETCDIR)/http.conf  2>/dev/null | grep -v ^\; | grep prefix | sed 's/ //g')
 HTTPPREFIX?=$(shell echo $(HTTPPREFIXBASE) | cut -f 2 -d '=')
 ifeq ($(HTTPPREFIXBASE),)
   HTTPPREFIX:=asterisk
 endif
-HTTPURL:=http://$(HTTPHOST):$(HTTPBINDPORT)$(HTTPPREFIX)/static/config/cfgbasic.html
-HTTPLOCALURL:=http://localhost:$(HTTPBINDPORT)$(HTTPPREFIX)/static/config/cfgbasic.html
+HTTPURL:=http://$(HTTPHOST):$(HTTPBINDPORT)/$(HTTPPREFIX)/static/config/cfgbasic.html
+HTTPLOCALURL:=http://localhost:$(HTTPBINDPORT)/$(HTTPPREFIX)/static/config/cfgbasic.html
 	
 #SUBDIRS:=tools
 SUBDIRS_CLEAN:=$(SUBDIRS:%=%-clean)