Project

General

Profile

« Previous | Next » 

Revision 7245

input.Makefile: $(import?): Renamed $public_import option to $full_import because it applies to any import of all datasources, not just a public import on vegbiendev

View differences:

inputs/input.Makefile
6 6
##### Configuration
7 7

  
8 8
# Command line
9
public_import ?=
9
full_import ?=
10 10
import_source ?= 1
11 11
log ?= $(if $(test),,1)
12 12
profile ?=
......
374 374
$(if $(profile),profile_to=$(trace)) $(map2db))$(if $(log), >>$(log_) 2>&1))
375 375
# don't abort on import errors, which often relate to invalid input data
376 376

  
377
import? = $(if $(call and,$(public_import),$(call dontImport,.)),,$(import))
377
import? = $(if $(call and,$(full_import),$(call dontImport,.)),,$(import))
378 378

  
379 379
import: $(importTables:%=%/import) _always ;
380 380

  
bin/import_all
13 13
        return 2
14 14
    fi
15 15
    : ${version=$(make -s version)}
16
    local dump_opts=${dump_opts---exclude-schema=public} public_import=1
17
    export version dump_opts public_import
16
    local dump_opts=${dump_opts---exclude-schema=public} full_import=1
17
    export version dump_opts full_import
18 18
    
19 19
    make schemas/$version/install
20 20
    

Also available in: Unified diff