Revision 5692
Added by Aaron Marcuse-Kubitza over 12 years ago
| inputs/input.Makefile | ||
|---|---|---|
| 191 | 191 |
|
| 192 | 192 |
logInstall = $(if $(log),$(if $(quiet),$(2)$(1)$(installLog) 2>&1,2>&1|tee $(3)\ |
| 193 | 193 |
$(1)$(installLog))) |
| 194 |
logInstallRoot = $(call logInstall,,>) |
|
| 194 | 195 |
logInstall* = $(call logInstall,$*/,>) |
| 195 | 196 |
logInstall*Add = $(call logInstall,$*/,>>,-a)# append to log |
| 196 | 197 |
|
| 197 | 198 |
# Must come before %/install to override it |
| 198 | 199 |
sql/install: $(dbExports) |
| 199 | 200 |
($(inDatasrc); cat $+|grep -vF 'SET search_path')|"time" $(psqlAsBien) \ |
| 200 |
$(logInstall) |
|
| 201 |
$(logInstallRoot)
|
|
| 201 | 202 |
|
| 202 | 203 |
# The export must be created with: |
| 203 | 204 |
# `--compatible=postgresql --add-locks=false --set-charset --no-create-info` |
Also available in: Unified diff
input.Makefile: Staging tables installation: sql/install: Fixed bug where $(logInstall) needed to be called with arguments, so that either > or >> would be used before the install log's filename