diff --git a/Makefile b/Makefile index 522505d..8222e1d 100644 --- a/Makefile +++ b/Makefile @@ -32,6 +32,7 @@ SHEET_MODULE_PATH = $(SOURCE_SCHEMA_DIR)/$(SHEET_MODULE).yaml # Use += to append variables from the variables file CONFIG_YAML = ifdef LINKML_GENERATORS_CONFIG_YAML +CONFIG_YAML += "--config-file" CONFIG_YAML += ${LINKML_GENERATORS_CONFIG_YAML} endif @@ -222,7 +223,7 @@ git-status: clean: rm -rf $(DEST) rm -rf tmp - rm -fr docs/* + rm -fr $(docdir)/* rm -fr $(PYMODEL)/* include project.Makefile diff --git a/config.public.mk b/config.public.mk index 9b566f2..0d2604c 100644 --- a/config.public.mk +++ b/config.public.mk @@ -8,16 +8,16 @@ # Note: makefile variables should not be quoted, as makefile handles quoting differently than bash LINKML_SCHEMA_NAME=pid4cat_model -LINKML_SCHEMA_AUTHOR=David Linke -LINKML_SCHEMA_DESCRIPTION=LinkML model for handle-based PIDs for resources in catalysis (PID4Cat) +LINKML_SCHEMA_AUTHOR="David Linke " +LINKML_SCHEMA_DESCRIPTION="LinkML model for handle-based PIDs for resources in catalysis (PID4Cat)" LINKML_SCHEMA_SOURCE_PATH=src/pid4cat_model/schema/pid4cat_model.yaml LINKML_SCHEMA_GOOGLE_SHEET_ID=1wVoaiFg47aT9YWNeRfTZ8tYHN8s8PAuDx5i2HUcDpvQ -LINKML_SCHEMA_GOOGLE_SHEET_TABS=personinfo enums +LINKML_SCHEMA_GOOGLE_SHEET_TABS="personinfo enums" ###### linkml generator variables, used by makefile ## gen-project configuration file -LINKML_GENERATORS_CONFIG_YAML= --config-file config.yaml +LINKML_GENERATORS_CONFIG_YAML=config.yaml ## pass args if gendoc ignores config.yaml (i.e. --no-mergeimports) LINKML_GENERATORS_DOC_ARGS=