diff --git a/doc/Build.txt b/doc/Build.txt index 3debaf24267515b51f802d70022e902fae40a7a0..cde1429c162e843981b74041f8077e4fa9e48a63 100644 --- a/doc/Build.txt +++ b/doc/Build.txt @@ -2,22 +2,15 @@ Build notes ------------ +=========== sflphoned -~~~~~~~~~ +--------- Instructions to build `sflphoned`: ---------------------------------- -autoreconf --install -make -sudo make install ---------------------------------- - - dbus-c++-bindings -^^^^^^^^^^^^^^^^^ +~~~~~~~~~~~~~~~~~ Go to `libs/dbus` and run: @@ -32,7 +25,7 @@ NOTE: If you have `colorgcc`, configure will *fail* on `libeXpat`. Issue an `uns libiax2 -^^^^^^^ +~~~~~~~ Go to `libs/libiax2` and run: @@ -43,11 +36,12 @@ sudo make install ------------------------- the daemon -^^^^^^^^^^ +~~~~~~~~~~ Then, go to the root of the repository, and run: --------------------------------------------------- +autoreconf --install ./configure --prefix=/usr (or whatever your prefix) make sudo make install @@ -55,13 +49,13 @@ sudo make install sflphone-qt -~~~~~~~~~~~ +----------- `sflphone-qt` is *deprecated* and should not be built anymore. sflphone-gtk -~~~~~~~~~~~~ +------------ Compile `sflphone-gtk` by running: diff --git a/www/index.php b/www/index.php index f9c3c096505686cb2edb41925c2eb44262a26fd2..cec9d0640232cffb542fa71a79e3991608182137 100644 --- a/www/index.php +++ b/www/index.php @@ -30,6 +30,13 @@ if (isset($_REQUEST['img'])) { exit(); } +if (isset($_REQUEST['file'])) { + include("header.php"); + show_page($_REQUEST['file']); + include("footer.php"); + exit(); +} + $module = ''; // Default module: home diff --git a/www/sflphone.funcs.php b/www/sflphone.funcs.php index 026125334e7a3ec94a00ff63aafb3dea492904fb..ba285613f2266da873151e97153394b17794f5d0 100644 --- a/www/sflphone.funcs.php +++ b/www/sflphone.funcs.php @@ -241,7 +241,7 @@ function get_git_hash($file) { $output = array(); - $cmd = "cd $GIT_REPOS; git-ls-tree $branch \"".git_filename($file)."\""; + $cmd = "cd $GIT_REPOS; git-ls-tree $branch \"".git_filename($split[0])."\""; $string = exec($cmd, $output); diff --git a/www/templates/page_build.php b/www/templates/page_build.php index 9f90e9ffff96be283288160f9414ae9b0e989f07..f225c12ceb4171f3b9e7e639922c1fed208ac820 100644 --- a/www/templates/page_build.php +++ b/www/templates/page_build.php @@ -1,3 +1 @@ -<h1>Build instructions</h1> - <?php show_page('Build.txt'); ?> diff --git a/www/templates/page_discuss.php b/www/templates/page_discuss.php index 4681de8f7fd9a85df646eca82ba37af1ef9011b0..ab46cdfed0ef1dfa4e5d906caf7a2675e1e112aa 100644 --- a/www/templates/page_discuss.php +++ b/www/templates/page_discuss.php @@ -1,6 +1,5 @@ <?php show_page('MailingLists.txt'); ?> - <?php show_page('IRC.txt'); ?>