Project

General

Profile

« Previous | Next » 

Revision 1196

input.Makefile: verify: Fixed bug where datasource name was not set for non-DB inputs

View differences:

input.Makefile
35 35
# Paths
36 36
root := $(selfDir_uZPPqC)..
37 37
mappings := $(root)/mappings
38
datasrc := $(notdir $(realpath .))
38 39
psqlOpts := --set ON_ERROR_STOP=1 --quiet
39 40
psqlAsBien := $(root)/bin/psql_vegbien $(psqlOpts)
40 41

  
......
162 163
	$(if $(wildcard $<),cat $<)
163 164
# don't run if verify.%.out's default do-nothing action was used
164 165

  
165
verify = $(psqlAsBien) --set=datasource="'$(db)'" --no-align\
166
verify = $(psqlAsBien) --set=datasource="'$(datasrc)'" --no-align\
166 167
--field-separator='	' --pset=footer=off --pset=null=NULL <$< >$@
167 168

  
168 169
verify.%.out: $(mappings)/verify.%.sql _always
......
246 247
ifneq ($(dbFile),)
247 248

  
248 249
dbEngineExt := $(subst .,,$(suffix $(basename $(notdir $(dbFile)))))
249
db := $(notdir $(realpath .))
250
db := $(datasrc)
250 251

  
251 252
#### Installation
252 253

  

Also available in: Unified diff