Project

General

Profile

« Previous | Next » 

Revision 7484

mappings/Makefile, input.Makefile: Renamed $(dict) to $(thesaurus) because Veg+-VegCore.csv is actually a thesaurus, not a dictionary

View differences:

input.Makefile
147 147

  
148 148
vocab := $(mappings)/VegCore.csv
149 149
coreMap := $(mappings)/VegCore-VegBIEN.csv
150
dict := $(mappings)/Veg+-VegCore.csv
150
thesaurus := $(mappings)/Veg+-VegCore.csv
151 151

  
152 152
viaMaps := $(importTables:%=%/map.csv)
153 153

  
......
298 298

  
299 299
# Via maps cleanup
300 300
ifneq ($(filter %/.map.csv.last_cleanup,$(MAKECMDGOALS)),)
301
%/.map.csv.last_cleanup: %/map.csv $(vocab) $(dict) $(coreMap) $(srcDict)
301
%/.map.csv.last_cleanup: %/map.csv $(vocab) $(thesaurus) $(coreMap) $(srcDict)
302 302
	$(call translate,$(srcDict))
303 303
	$(bin)/in_place $< $(bin)/canon 1 $(vocab)
304
	$(call translate,$(dict))
304
	$(call translate,$(thesaurus))
305 305
	touch $@
306 306
	+$(selfMake) $(<:%/map.csv=%/unmapped_terms.csv)
307 307
	+$(selfMake) $(<:%/map.csv=%/new_terms.csv)
......
330 330
	tail -n +2 $<|$(bin)/cols 1|$(bin)/filter_out_ci 0 $(coreMap) >$@
331 331
	$(bin)/autoremove $@
332 332

  
333
%/new_terms.csv: %/map.csv $(vocab) $(dict) %/unmapped_terms.csv
333
%/new_terms.csv: %/map.csv $(vocab) $(thesaurus) %/unmapped_terms.csv
334 334
	$(newTerms)
335 335
	$(bin)/autoremove $@
336 336
newTerms = tail -n +2 $<|$(bin)/filter_out_ci 0 $(vocab)|$(bin)/filter_out_ci 0\
337
$(dict) $(if $(wildcard $(word 4,$+)),|$(bin)/filter_out_ci 0 $(word 4,$+))\
337
$(thesaurus) $(if $(wildcard $(word 4,$+)),|$(bin)/filter_out_ci 0 $(word 4,$+))\
338 338
|grep -vE -e '^"?:' -e 'UNUSED' >$@; exit 0 # grep exits nonzero if no match
339 339

  
340 340
termsSubdirs := $(importTables)

Also available in: Unified diff