Project

General

Profile

« Previous | Next » 

Revision 10205

bugfix: inputs/input.Makefile: map.csv and derived files: use $(tables) instead of $(importTables) when making them so that the mappings of those tables are still kept up-to-date even though they are marked _no_import (and not imported into the main DB)

View differences:

inputs/input.Makefile
171 171
thesaurus := $(mappings)/VegCore.thesaurus.csv
172 172
coreMap := $(mappings)/VegCore-VegBIEN.csv
173 173

  
174
viaMaps := $(importTables:%=%/map.csv)
174
viaMaps := $(tables:%=%/map.csv)
175 175

  
176 176
autogenMaps := $(subst map.,VegBIEN.,$(viaMaps))
177 177
directMaps := $(autogenMaps) $(filter-out $(autogenMaps),\
......
390 390
$(thesaurus) $(if $(wildcard $(word 4,$+)),|$(bin)/filter_out_ci 0 $(word 4,$+))\
391 391
|grep -vE -e '^"?:' -e 'UNUSED' >$@; exit 0 # grep exits nonzero if no match
392 392

  
393
termsSubdirs := $(importTables)
393
termsSubdirs := $(tables)
394 394

  
395 395
include $(root)/lib/mappings.Makefile
396 396

  
......
551 551
tests += %/test.by_col.xml
552 552
endif
553 553

  
554
testOutputs := $(foreach test,$(tests),$(importTables:%=$(test)))
554
testOutputs := $(foreach test,$(tests),$(tables:%=$(test)))
555 555

  
556 556
.PRECIOUS: $(testOutputs) # save outputs of failed tests so they can be accepted
557 557

  

Also available in: Unified diff