Merged revisions 292050 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r292050 | tzafrir | 2010-10-16 12:47:00 +0200 (ש', 16 אוק 2010) | 22 lines

  Merged revisions 292049 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r292049 | tzafrir | 2010-10-16 12:03:04 +0200 (ש', 16 אוק 2010) | 15 lines

    Base directory for MOH should be ASTDATADIR

    If the directive 'directory' is relative, make it relative to the
    datadir, rather than to the varlibdir. In the sample configuration
    it is relative ('moh').

    This has no effect unless you have actively set the datadir explicitly
    (at build time or at run time).

    (closes issue #16906)
    Patches:
          moh_datadir uploaded by tzafrir (license 46)

    Review: https://reviewboard.asterisk.org/r/974/
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@292052 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/configs/musiconhold.conf.sample b/configs/musiconhold.conf.sample
index 714e2640305addc320ca692685af45d8e1b295c0..9147588f161dc899baeb112ac093fcc0c7c140af 100644 (file)
--- a/configs/musiconhold.conf.sample
+++ b/configs/musiconhold.conf.sample
@@ -31,7 +31,7 @@
 ;
 ; The path specified can be either an absolute path (starts with '/'),
 ; or a relative path; relative paths are interpreted as being relative
-; to the 'astvarlibdir' in asterisk.conf, which defaults to
+; to the 'astdatalibdir' in asterisk.conf, which defaults to
 ; /var/lib/asterisk.
 ;
 ; NOTE:

diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index 6024e9da846c611de7659e6e35b484fdc060b062..f0ef9b88c6bb01d474ba579f2b22ad40b430dd2d 100644 (file)
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -1022,7 +1022,7 @@ static int moh_scan_files(struct mohclass *class) {
        int i;
 
        if (class->dir[0] != '/') {
-               ast_copy_string(dir_path, ast_config_AST_VAR_DIR, sizeof(dir_path));
+               ast_copy_string(dir_path, ast_config_AST_DATA_DIR, sizeof(dir_path));
                strncat(dir_path, "/", sizeof(dir_path) - 1);
                strncat(dir_path, class->dir, sizeof(dir_path) - 1);
        } else {