diff options
| author | Joshua Colp <jcolp@digium.com> | 2006-04-15 23:37:29 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2006-04-15 23:37:29 +0000 |
| commit | 5c05128777938eb3649cd085f266c7f2cf92f248 (patch) | |
| tree | 2f27558bdad1cfb7ea6e3dc0b478aa1aeedeefa0 | |
| parent | e8a94a71e29a130b513ac29e75fcd36df55e862f (diff) | |
Move a bit more stuff over to the datadir (issue #6967 reported by tzafrir patch by north)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20358 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | Makefile | 14 | ||||
| -rw-r--r-- | asterisk.c | 2 | ||||
| -rw-r--r-- | channels/chan_iax2.c | 2 |
3 files changed, 9 insertions, 9 deletions
@@ -682,18 +682,18 @@ bininstall: all mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom - mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/keys - mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware - mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax + mkdir -p $(DESTDIR)$(ASTDATADIR)/keys + mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware + mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax mkdir -p $(DESTDIR)$(ASTMANDIR)/man8 - $(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys - $(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys + $(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys + $(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys $(INSTALL) -m 644 asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 $(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8 $(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8 $(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 if [ -d contrib/firmware/iax ]; then \ - $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \ + $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \ else \ echo "You need to do cvs update -d not just cvs update" ; \ fi @@ -942,7 +942,7 @@ _uninstall: rm -f $(DESTDIR)$(ASTSBINDIR)/autosupport rm -rf $(DESTDIR)$(ASTHEADERDIR) rm -rf $(DESTDIR)$(ASTDATADIR)/sounds - rm -rf $(DESTDIR)$(ASTVARLIBDIR)/firmware + rm -rf $(DESTDIR)$(ASTDATADIR)/firmware rm -rf $(DESTDIR)$(ASTMANDIR)/man8 for x in $(SUBDIRS); do $(MAKE) -C $$x uninstall || exit 1 ; done diff --git a/asterisk.c b/asterisk.c index 9fd967497..2db0ea67d 100644 --- a/asterisk.c +++ b/asterisk.c @@ -2118,9 +2118,9 @@ static void ast_readconfig(void) } else if (!strcasecmp(v->name, "astvarlibdir")) { ast_copy_string(ast_config_AST_VAR_DIR, v->value, sizeof(ast_config_AST_VAR_DIR)); snprintf(ast_config_AST_DB, sizeof(ast_config_AST_DB), "%s/astdb", v->value); - snprintf(ast_config_AST_KEY_DIR, sizeof(ast_config_AST_KEY_DIR), "%s/keys", v->value); } else if (!strcasecmp(v->name, "astdatadir")) { ast_copy_string(ast_config_AST_DATA_DIR, v->value, sizeof(ast_config_AST_DATA_DIR)); + snprintf(ast_config_AST_KEY_DIR, sizeof(ast_config_AST_KEY_DIR), "%s/keys", v->value); } else if (!strcasecmp(v->name, "astlogdir")) { ast_copy_string(ast_config_AST_LOG_DIR, v->value, sizeof(ast_config_AST_LOG_DIR)); } else if (!strcasecmp(v->name, "astagidir")) { diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 27270868e..7a5b38134 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -1530,7 +1530,7 @@ static void reload_firmware(void) cur = cur->next; } /* Now that we've freed them, load the new ones */ - snprintf(dir, sizeof(dir), "%s/firmware/iax", (char *)ast_config_AST_VAR_DIR); + snprintf(dir, sizeof(dir), "%s/firmware/iax", (char *)ast_config_AST_DATA_DIR); fwd = opendir(dir); if (fwd) { while((de = readdir(fwd))) { |