[build] substitution for use of LIBPOSTAL_DATA_DIR in Makefile.am

2015-10-26 18:35:23 -04:00
parent f6b6a17335
commit 83c6a87ab1
3 changed files with 12 additions and 5 deletions
--- a/src/address_dictionary.c
+++ b/src/address_dictionary.c
@@ -539,7 +539,11 @@ bool address_dictionary_save(char *path) {
 }

 inline bool address_dictionary_module_setup(char *filename) {
-    return address_dictionary_load(filename == NULL ? DEFAULT_ADDRESS_EXPANSION_PATH: filename);
+    if (address_dict == NULL) {
+        return address_dictionary_load(filename == NULL ? DEFAULT_ADDRESS_EXPANSION_PATH: filename);
+    }
+
+    return true;
 }

 void address_dictionary_module_teardown(void) {