bkruse: branch group/new_exp r1809 - in /team/group/new_exp: ./ scripts/

SVN commits to the Asterisk-GUI project asterisk-gui-commits at lists.digium.com
Mon Nov 19 13:38:49 CST 2007 

Author: bkruse
Date: Mon Nov 19 13:38:49 2007
New Revision: 1809

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=1809
Log:
Lets See. Editing the makefile and configure and
make them work now. And now asterisk-gui will have
a dynamic astman.js based on the Makefile variables

Modified:
    team/group/new_exp/Makefile
    team/group/new_exp/configure
    team/group/new_exp/makeopts.in
    team/group/new_exp/scripts/astman.js

Modified: team/group/new_exp/Makefile
URL: http://svn.digium.com/view/asterisk-gui/team/group/new_exp/Makefile?view=diff&rev=1809&r1=1808&r2=1809
==============================================================================
--- team/group/new_exp/Makefile (original)
+++ team/group/new_exp/Makefile Mon Nov 19 13:38:49 2007
@@ -25,9 +25,23 @@
 export BASENAME
 export PBX_ZAPTEL
 export ZAPTEL_INCLUDE
-export ASTSBINDIR
 export ASTCFLAGS
 export ASTLDFLAGS
+export ZAPETCDIR
+export ASTETCDIR
+export ASTLIBDIR
+export ASTVARLIBDIR
+export ASTSPOOLDIR
+export ASTLOGDIR
+export ASTHEADERDIR
+export ASTBINDIR
+export ASTSBINDIR
+export ASTVARRUNDIR
+export ASTMANDIR
+export ASTDATADIR
+export ASTCONFPATH
+export MODULES_DIR
+export AGI_DIR
 
 ifneq ($(findstring BSD,$(OSARCH)),)
   ASTCFLAGS+=-I/usr/local/include
@@ -44,46 +58,43 @@
 # !!! Watch out, put no spaces or comments after the value !!!
 #DESTDIR?=/tmp/asterisk-gui
 
+# Define standard directories for various platforms
+# These apply if they are not redefined in asterisk.conf
 ifeq ($(OSARCH),SunOS)
-  ASTETCDIR:=$(DESTDIR)/var/etc/asterisk
+  ASTETCDIR=/var/etc/asterisk
+  ASTLIBDIR=/opt/asterisk/lib
+  ASTVARLIBDIR=/var/opt/asterisk
+  ASTSPOOLDIR=/var/spool/asterisk
+  ASTLOGDIR=/var/log/asterisk
+  ASTHEADERDIR=/opt/asterisk/include
+  ASTBINDIR=/opt/asterisk/bin
+  ASTSBINDIR=/opt/asterisk/sbin
+  ASTVARRUNDIR=/var/run/asterisk
+  ASTMANDIR=/opt/asterisk/man
 else
-  ASTETCDIR:=$(DESTDIR)$(sysconfdir)/asterisk
-endif
-ASTETCDIR:=$(shell cat $(ASTETCDIR)  2>/dev/null | grep -v ^\; | grep astetcdir | cut -f 3 -d ' ')
-ifeq ($(ASTETCDIR),)
-  ifeq ($(OSARCH),SunOS)
-    ASTETCDIR:=$(DESTDIR)/var/etc/asterisk
-  else
-    ASTETCDIR:=$(DESTDIR)$(sysconfdir)/asterisk
-  endif
-endif
-
-ASTVARLIBDIR?=$(shell cat $(ASTETCDIR)  2>/dev/null | grep -v ^\; | grep astvarlibdir | cut -f 3 -d ' ')
-ifeq ($(ASTVARLIBDIR),)
-  ifeq ($(OSARCH),SunOS)
-    ASTVARLIBDIR:=$(DESTDIR)/var/opt/asterisk
-  else
-    ifeq ($(OSARCH),FreeBSD)
-      ASTVARLIBDIR:=$(DESTDIR)$(prefix)/share/asterisk
-    else
-      ASTVARLIBDIR:=$(DESTDIR)$(localstatedir)/lib/asterisk
-    endif
-  endif
-endif
-
-
-ASTSBINDIR?=$(shell cat $(ASTETCDIR)  2>/dev/null | grep -v ^\; | grep astsbindir | cut -f 3 -d ' ')
-ifeq ($(ASTSBINDIR),)
-  ifeq ($(OSARCH),SunOS)
-    ASTSBINDIR:=$(DESTDIR)/opt/asterisk/sbin
-  else
-    ASTSBINDIR:=$(DESTDIR)$(sbindir)
-  endif
-endif
-
+  ASTETCDIR=$(sysconfdir)/asterisk
+  ASTLIBDIR=$(libdir)/asterisk
+  ASTHEADERDIR=$(includedir)/asterisk
+  ASTBINDIR=$(bindir)
+  ASTSBINDIR=$(sbindir)
+  ASTSPOOLDIR=$(localstatedir)/spool/asterisk
+  ASTLOGDIR=$(localstatedir)/log/asterisk
+  ASTVARRUNDIR=$(localstatedir)/run
+  ASTMANDIR=$(mandir)
+ifneq ($(findstring BSD,$(OSARCH)),)
+  ASTVARLIBDIR=$(prefix)/share/asterisk
+  ASTVARRUNDIR=$(localstatedir)/run/asterisk
+else
+  ASTVARLIBDIR=$(localstatedir)/lib/asterisk
+endif
+endif
 ifeq ($(ASTDATADIR),)
   ASTDATADIR:=$(ASTVARLIBDIR)
 endif
+
+ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
+MODULES_DIR=$(ASTLIBDIR)/modules
+AGI_DIR=$(ASTDATADIR)/agi-bin
 
 HTTPDIR:=$(ASTDATADIR)/static-http
 CONFIGDIR:=$(HTTPDIR)/config
@@ -125,8 +136,22 @@
 
 _all: makeopts $(SUBDIRS)
 
-$(SUBDIRS):
+$(SUBDIRS): defaults.h astman_vars.js
 	@$(MAKE) -C $@
+
+defaults.h: makeopts
+	@build_tools/make_defaults_h > $@.tmp
+	@if cmp -s $@.tmp $@ ; then : ; else \
+		mv $@.tmp $@ ; \
+	fi
+	@rm -f $@.tmp
+
+astman_vars.js: makeopts
+	@build_tools/make_astman_vars_js > $@.tmp
+	@if cmp -s $@.tmp config/scripts/$@ ; then : ; else \
+		mv $@.tmp config/scripts/$@ ; \
+	fi
+	@rm -f $@.tmp
 
 checkconfig:
 	@echo " --- Checking Asterisk configuration to see if it will support the GUI ---"
@@ -266,6 +291,8 @@
 	@$(MAKE) -C $(@:-clean=) clean
 
 clean: $(SUBDIRS_CLEAN)
+	rm -f defaults.h
+	rm -f config/scripts/astman_vars.js
 
 distclean: clean
 	-rm -f makeopts config.log config.status

Modified: team/group/new_exp/configure
URL: http://svn.digium.com/view/asterisk-gui/team/group/new_exp/configure?view=diff&rev=1809&r1=1808&r2=1809
==============================================================================
--- team/group/new_exp/configure (original)
+++ team/group/new_exp/configure Mon Nov 19 13:38:49 2007
@@ -558,14 +558,12 @@
 SHELL=${CONFIG_SHELL-/bin/sh}
 
 # Identity of this package.
-PACKAGE_NAME=
+PACKAGE_NAME="Asterisk-GUI"
 PACKAGE_TARNAME=
 PACKAGE_VERSION=
 PACKAGE_STRING=
 PACKAGE_BUGREPORT=
 
-ac_unique_file="asterisk-gui"
-ac_unique_file="tools/zapscan.c"
 ac_subst_vars='SHELL
 PATH_SEPARATOR
 PACKAGE_NAME

Modified: team/group/new_exp/makeopts.in
URL: http://svn.digium.com/view/asterisk-gui/team/group/new_exp/makeopts.in?view=diff&rev=1809&r1=1808&r2=1809
==============================================================================
--- team/group/new_exp/makeopts.in (original)
+++ team/group/new_exp/makeopts.in Mon Nov 19 13:38:49 2007
@@ -20,6 +20,7 @@
 
 ZAPTEL_INCLUDE=@ZAPTEL_INCLUDE@
 PBX_ZAPTEL=@PBX_ZAPTEL@
+ZAPETCDIR=/etc
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@

Modified: team/group/new_exp/scripts/astman.js
URL: http://svn.digium.com/view/asterisk-gui/team/group/new_exp/scripts/astman.js?view=diff&rev=1809&r1=1808&r2=1809
==============================================================================
--- team/group/new_exp/scripts/astman.js (original)
+++ team/group/new_exp/scripts/astman.js Mon Nov 19 13:38:49 2007
@@ -4,6 +4,8 @@
  * Copyright (C) 1999 - 2007, Digium, Inc.
  *
  * Mark Spencer <markster at digium.com>
+ * Pari Nannapaneni <pari at digium.com>
+ * Brandon Kruse <bkruse at digium.com>
  *
  * See http://www.asterisk.org for more information about
  * the Asterisk project. Please do not directly contact

More information about the asterisk-gui-commits mailing list