diff --git a/Makefile b/Makefile index 4da603280..d240e22bd 100644 --- a/Makefile +++ b/Makefile @@ -278,15 +278,13 @@ $(SASS): $(shell find $(COMMON)/styles/scss/) # should eventually be removed DEPRECATED_JS_CONFIG=chaise-config.js -JS_CONFIG_SAMPLE= $(CONFIG)/chaise-config-sample.js JS_CONFIG=$(CONFIG)/chaise-config.js -$(JS_CONFIG): $(JS_CONFIG_SAMPLE) +$(JS_CONFIG): $(CONFIG)/chaise-config-sample.js cp -n $(CONFIG)/chaise-config-sample.js $(JS_CONFIG) || true touch $(JS_CONFIG) -VIEWER_CONFIG_SAMPLE=$(CONFIG)/viewer-config-sample.js VIEWER_CONFIG=$(CONFIG)/viewer-config.js -$(VIEWER_CONFIG): $(VIEWER_CONFIG_SAMPLE) +$(VIEWER_CONFIG): $(CONFIG)/viewer-config-sample.js cp -n $(CONFIG)/viewer-config-sample.js $(VIEWER_CONFIG) || true touch $(VIEWER_CONFIG) diff --git a/docs/user-docs/chaise-config-change-logs.md b/docs/user-docs/chaise-config-change-logs.md index 88145c271..d8b3e09e0 100644 --- a/docs/user-docs/chaise-config-change-logs.md +++ b/docs/user-docs/chaise-config-change-logs.md @@ -2,6 +2,14 @@ The file contains changes made to chaise-config parameters. - Refer to [chaise-config.d](chaise-config.md) for currently supported parameters - Refer to [chaise-config-deprecated.md](chaise-config-deprecated.md) for deprecated parameters +#### 11/07/2023 #### + +###### PR Link + - [chaise](https://github.com/informatics-isi-edu/chaise/pull/2375) + +###### Added + - We are now also fetching the `chaise-config.js` from the `config/chaise-config.js` location. Later we are going to stop trying the old location and only use the new location. + #### 07/14/2023 #### ###### PR Link