<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][16239] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=16239">16239</a></dd>
<dt>Author</dt> <dd>mikej</dd>
<dt>Date</dt> <dd>2010-01-11 09:47:36 -0600 (Mon, 11 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>add configure vars for htdocs and grammar dirs</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkMakefileam">freeswitch/trunk/Makefile.am</a></li>
<li><a href="#freeswitchtrunkbuildmodmakerulesin">freeswitch/trunk/build/modmake.rules.in</a></li>
<li><a href="#freeswitchtrunkconfigurein">freeswitch/trunk/configure.in</a></li>
<li><a href="#freeswitchtrunksrcmodasr_ttsmod_pocketsphinxMakefile">freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/Makefile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkMakefileam"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/Makefile.am (16238 => 16239)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/Makefile.am 2010-01-11 14:36:29 UTC (rev 16238)
+++ freeswitch/trunk/Makefile.am 2010-01-11 15:47:36 UTC (rev 16239)
</span><span class="lines">@@ -305,24 +305,23 @@
</span><span class="cx"> done
</span><span class="cx">
</span><span class="cx"> samples-htdocs:
</span><del>- test -d $(DESTDIR)$(prefix)/htdocs || $(mkinstalldirs) $(DESTDIR)$(prefix)/htdocs
</del><ins>+ test -d $(DESTDIR)@htdocsdir@/ || $(mkinstalldirs) $(DESTDIR)@htdocsdir@
</ins><span class="cx"> for htdocsfile in `find htdocs -name \* | grep -v .svn` ; do \
</span><span class="cx"> dir=`echo $$htdocsfile | sed -e 's|/[^/]*$$||'`; \
</span><span class="cx"> filename=`echo $$htdocsfile | sed -e 's|^.*/||'`; \
</span><del>- test -d $(DESTDIR)$(PREFIX)/$$dir || $(mkinstalldirs) $(DESTDIR)$(prefix)/$$dir ; \
- test -f $(DESTDIR)$(PREFIX)/$$dir/$$filename || $(INSTALL) -m 644 $$dir/$$filename $(DESTDIR)$(PREFIX)/$$dir 2>/dev/null; \
</del><ins>+ test -d $(DESTDIR)@htdocsdir@/$$dir || $(mkinstalldirs) $(DESTDIR)@htdocsdir@/$$dir ; \
+ test -f $(DESTDIR)@htdocsdir@/$$dir/$$filename || $(INSTALL) -m 644 $$dir/$$filename $(DESTDIR)@htdocsdir@/$$dir 2>/dev/null; \
</ins><span class="cx"> done
</span><span class="cx">
</span><span class="cx"> samples: samples-conf samples-htdocs
</span><span class="cx">
</span><span class="cx"> install-data-local:
</span><span class="cx"> @echo Installing $(NAME)
</span><del>- @for x in @modulesdir@ @runtimedir@ @dbdir@ @logfiledir@ @logfiledir@/xml_cdr @bindir@ @scriptdir@ @recordingsdir@ ; do \
</del><ins>+ @for x in @modulesdir@ @runtimedir@ @dbdir@ @logfiledir@ @logfiledir@/xml_cdr @bindir@ @scriptdir@ @recordingsdir@ @grammardir@; do \
</ins><span class="cx"> $(mkinstalldirs) $(DESTDIR)$$x ; \
</span><span class="cx"> done
</span><del>- $(mkinstalldirs) $(DESTDIR)$(prefix)/grammar
</del><span class="cx"> test -d $(DESTDIR)@confdir@ || $(MAKE) samples-conf
</span><del>- test -d $(DESTDIR)$(prefix)/htdocs || $(MAKE) samples-htdocs
</del><ins>+ test -d $(DESTDIR)@htdocsdir@ || $(MAKE) samples-htdocs
</ins><span class="cx">
</span><span class="cx"> src/include/switch_version.h: $(switch_builddir)/src/include/switch_version.h.in .version $(libfreeswitch_la_SOURCES) $(library_include_HEADERS)
</span><span class="cx"> @have_version=1 ; \
</span></span></pre></div>
<a id="freeswitchtrunkbuildmodmakerulesin"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/build/modmake.rules.in (16238 => 16239)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/build/modmake.rules.in 2010-01-11 14:36:29 UTC (rev 16238)
+++ freeswitch/trunk/build/modmake.rules.in 2010-01-11 15:47:36 UTC (rev 16239)
</span><span class="lines">@@ -17,6 +17,7 @@
</span><span class="cx"> logfiledir=@logfiledir@
</span><span class="cx"> sysconfdir=@sysconfdir@
</span><span class="cx"> localstatedir=@localstatedir@
</span><ins>+garmmardir=@grammardir@
</ins><span class="cx">
</span><span class="cx"> CC=@CC@
</span><span class="cx"> CXX=@CXX@
</span></span></pre></div>
<a id="freeswitchtrunkconfigurein"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/configure.in (16238 => 16239)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/configure.in 2010-01-11 14:36:29 UTC (rev 16238)
+++ freeswitch/trunk/configure.in 2010-01-11 15:47:36 UTC (rev 16239)
</span><span class="lines">@@ -52,6 +52,14 @@
</span><span class="cx"> AC_SUBST(dbdir)
</span><span class="cx"> AC_DEFINE_UNQUOTED([SWITCH_DB_DIR],"${dbdir}",[where to put db files])
</span><span class="cx">
</span><ins>+htdocsdir="${prefix}/htdocs"
+AC_SUBST(htdocsdir)
+AC_DEFINE_UNQUOTED([SWITCH_HTDOCS_DIR],"${htdocsdir}",[where to put htdocs files])
+
+grammardir="${prefix}/grammar"
+AC_SUBST(grammardir)
+AC_DEFINE_UNQUOTED([SWITCH_GRAMMAR_DIR],"${grammardir}",[where to put grammar files])
+
</ins><span class="cx"> scriptdir="${prefix}/scripts"
</span><span class="cx"> AC_SUBST(scriptdir)
</span><span class="cx"> AC_DEFINE_UNQUOTED([SWITCH_SCRIPT_DIR],"${scriptdir}",[where to put script files])
</span></span></pre></div>
<a id="freeswitchtrunksrcmodasr_ttsmod_pocketsphinxMakefile"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/Makefile (16238 => 16239)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/Makefile 2010-01-11 14:36:29 UTC (rev 16238)
+++ freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/Makefile 2010-01-11 15:47:36 UTC (rev 16239)
</span><span class="lines">@@ -43,19 +43,19 @@
</span><span class="cx"> cd $(POCKETSPHINX_BUILDDIR) && $(MAKE)
</span><span class="cx"> $(TOUCH_TARGET)
</span><span class="cx">
</span><del>-$(DESTDIR)$(PREFIX)/grammar/model:
- mkdir -p $(DESTDIR)$(PREFIX)/grammar/model
</del><ins>+$(DESTDIR)$(grammardir)/model:
+ mkdir -p $(DESTDIR)$(grammardir)/model
</ins><span class="cx">
</span><del>-$(DESTDIR)$(PREFIX)/grammar/model/communicator:
</del><ins>+$(DESTDIR)$(grammardir)/model/communicator:
</ins><span class="cx"> $(GETLIB) $(SPHINXMODEL).tar.gz
</span><del>- mkdir -p $(DESTDIR)$(PREFIX)/grammar/model/communicator
- cp -rp $(switch_srcdir)/libs/Communicator_semi_40.cd_semi_6000/* $(DESTDIR)$(PREFIX)/grammar/model/communicator
</del><ins>+ mkdir -p $(DESTDIR)$(grammardir)/model/communicator
+ cp -rp $(switch_srcdir)/libs/Communicator_semi_40.cd_semi_6000/* $(DESTDIR)$(grammardir)/model/communicator
</ins><span class="cx">
</span><del>-$(DESTDIR)$(PREFIX)/grammar/model/wsj1:
- mkdir -p $(DESTDIR)$(PREFIX)/grammar/model/wsj1
- cp -rp $(POCKETSPHINX_DIR)/model/hmm/wsj1/* $(DESTDIR)$(PREFIX)/grammar/model/wsj1
</del><ins>+$(DESTDIR)$(grammardir)/model/wsj1:
+ mkdir -p $(DESTDIR)$(grammardir)/model/wsj1
+ cp -rp $(POCKETSPHINX_DIR)/model/hmm/wsj1/* $(DESTDIR)$(grammardir)/model/wsj1
</ins><span class="cx">
</span><span class="cx"> dictionary:
</span><del>- @cp -f $(POCKETSPHINX_DIR)/model/lm/cmudict.0.6d $(DESTDIR)$(PREFIX)/grammar/default.dic
</del><ins>+ @cp -f $(POCKETSPHINX_DIR)/model/lm/cmudict.0.6d $(DESTDIR)$(grammardir)/default.dic
</ins><span class="cx">
</span><del>-local_install: $(DESTDIR)$(PREFIX)/grammar/model $(DESTDIR)$(PREFIX)/grammar/model/communicator $(DESTDIR)$(PREFIX)/grammar/model/wsj1 dictionary
</del><ins>+local_install: $(DESTDIR)$(grammardir)/model $(DESTDIR)$(grammardir)/model/communicator $(DESTDIR)$(grammardir)/model/wsj1 dictionary
</ins></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>