bkruse: trunk r1594 - in /trunk: ./ config/scripts/astman.js tools/Makefile

[SVN commits to the Asterisk-GUI project]

Author: bkruse
Date: Thu Sep 13 15:47:36 2007
New Revision: 1594

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=1594
Log:
Merged revisions 1593 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-gui/branches/1.4

........
r1593 | bkruse | 2007-09-13 15:47:12 -0500 (Thu, 13 Sep 2007) | 1 line

Reverting some changes earlier for ztscan and zapscan
........

Modified:
    trunk/   (props changed)
    trunk/config/scripts/astman.js
    trunk/tools/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/config/scripts/astman.js
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/scripts/astman.js?view=diff&rev=1594&r1=1593&r2=1594
==============================================================================
--- trunk/config/scripts/astman.js (original)
+++ trunk/config/scripts/astman.js Thu Sep 13 15:47:36 2007
@@ -32,8 +32,8 @@
 var asterisk_menusRecord_path = asterisk_Sounds_path + "record/";
 var asterisk_guiSysInfo = "sh " + asterisk_scriptsFolder + "gui_sysinfo" ;
 var asterisk_guiSysInfo_output = "./sysinfo_output.html";
-var asterisk_guiZapscan = "zapscan.bin" ;
-var asterisk_guiZtscan = "ztscan";
+var asterisk_guiZapscan = "/sbin/zapscan.bin" ;
+var asterisk_guiZtscan = "/sbin/ztscan";
 var asterisk_rawmanPath = "../../rawman" ;
 var asterisk_guiConfigFile = "guipreferences.conf"; // will be created in asterisk_configfolder, if the file does not exist 
 var asterisk_configfolder = "/etc/asterisk/";

Modified: trunk/tools/Makefile
URL: http://svn.digium.com/view/asterisk-gui/trunk/tools/Makefile?view=diff&rev=1594&r1=1593&r2=1594
==============================================================================
--- trunk/tools/Makefile (original)
+++ trunk/tools/Makefile Thu Sep 13 15:47:36 2007
@@ -35,6 +35,10 @@
 	$(INSTALL) -m 755 zapscan.bin $(ASTSBINDIR)
 	$(INSTALL) -m 755 zapscan $(ASTSBINDIR)
 	$(INSTALL) -m 755 ztscan $(ASTSBINDIR)
+	$(INSTALL) -m 755 zapscan.bin /sbin/zapscan.bin
+	$(INSTALL) -m 755 zapscan /sbin/zapscan
+	$(INSTALL) -m 755 ztscan /sbin/ztscan
+
 	
 endif