Replace DATA_DIR macro with variable