Project

General

Profile

« Previous | Next » 

Revision 14532

bugfix: inputs/input.Makefile: sql/install: ";" for commands inside $(if) blocks need to be inside the $(if) block, too, because otherwise there will be dangling ";" without a statement (bash does not support empty statements containing just ";")

View differences:

trunk/inputs/input.Makefile
266 266

  
267 267
# Must come before %/install to override it
268 268
sql/install: $(dbExports)
269
	set -o pipefail; ($(inDatasrc); $(if $(wildcard schema.sql),cat schema.sql);\
270
cat $(filter-out schema.sql grants.sql,$+)|pg_dump_limit; $(if $(wildcard\
271
grants.sql),cat grants.sql))|"time" env no_search_path=1 \
269
	set -o pipefail; ($(inDatasrc); $(if $(wildcard schema.sql),cat schema.sql;)\
270
cat $(filter-out schema.sql grants.sql,$+)|pg_dump_limit $(if $(wildcard\
271
grants.sql),; cat grants.sql))|"time" env no_search_path=1 \
272 272
$(bin)/psql_$(if $(debug),verbose,script)_vegbien --set=schema='"$(datasrc)"' \
273 273
$(logInstallRoot)
274 274

  

Also available in: Unified diff