1 diff -Nru elmo-0.4/src/abook.c elmo-0.4.new/src/abook.c
2 --- elmo-0.4/src/abook.c Thu Mar 13 20:51:32 2003
3 +++ elmo-0.4.new/src/abook.c Sat Mar 29 07:34:33 2003
7 afile = cf_txtvar_lookup ("addressbook");
9 - afile = file_with_dir (getenv ("HOME"), ".addressbook");
10 + if (afile == NULL) {
11 + char *etc_dir = getenv("ETC_DIR");
14 + afile = file_with_dir (etc_dir, "addressbook");
16 + afile = file_with_dir (getenv ("HOME"), ".addressbook");
19 afile = xstrdup (afile);
21 diff -Nru elmo-0.4/src/confread.c elmo-0.4.new/src/confread.c
22 --- elmo-0.4/src/confread.c Mon Mar 17 08:24:02 2003
23 +++ elmo-0.4.new/src/confread.c Sat Mar 29 07:31:40 2003
25 #define BUFFER_SIZE 128
27 #define CONF_FILE ".elmorc"
28 +#define ETC_DIR_CONF_FILE "elmorc"
30 enum type_t {TYPE_TXT, TYPE_NUM};
33 conf_table = htable_create (size);
36 - if (config_file == NULL)
37 - file = file_with_dir (getenv ("HOME"), CONF_FILE);
38 + if (config_file == NULL){
39 + char *etc_dir = getenv("ETC_DIR");
42 + file = file_with_dir (etc_dir, ETC_DIR_CONF_FILE);
44 + file = file_with_dir (getenv ("HOME"), CONF_FILE);
47 file = xstrdup (config_file);