Project

General

Profile

« Previous | Next » 

Revision 4456

input.Makefile: Staging tables installation: %/install: Fixed bug where $(if $(isRef)) needed to be checked before $(if $(nonXml)) because a subdir referencing an already-installed staging table must be treated specially by ignoring its autogenerated header.csv file, and not trying to install that file as if it were itself CSV data

View differences:

inputs/input.Makefile
233 233
hasRowNum = $(if $(isJoinedTable),,1)
234 234

  
235 235
%/install: _always
236
	$(if $(nonXml),$(import_install_),$(if $(isRef),$(exportHeader)))
236
	$(if $(isRef),$(exportHeader),$(if $(nonXml),$(import_install_)))
237 237
import_install_ = (prefix=; . $(bin)/vegbien_dest; "time" nice -n +5\
238 238
env schema=$(datasrc) table=$* has_row_num=$(hasRowNum) $(bin)/csv2db\
239 239
$(catSrcs) $(call logInstall,$*/logs/))

Also available in: Unified diff