Project

General

Profile

« Previous | Next » 

Revision 6197

root Makefile: PostgreSQL: postgres-Darwin: Also install postgresql.Mac.conf

View differences:

Makefile
139 139
editApachePortsConf = echo $$'1\n,s/\\b80\\b/8080/g\nwq'|\
140 140
sudo ed --loose-exit-status --verbose /etc/apache2/ports.conf
141 141

  
142
asAdmin := sudo -E -u postgres
142 143
pgVersion = "$$(env minor=1 bin/pg_version)"
143 144

  
144 145
postgres-Linux: _always
......
167 168
macPostgresLibs := $(macPostgresLibs) $(macPostgresLibs:%=%.1.0.0)
168 169
macPostgresLibs := $(macPostgresLibs:%=%.dylib)
169 170

  
171
pg_ctl-Darwin := $(asAdmin) pg_ctl -D $(macPostgresDir)/data\
172
-l $(macPostgresDir)/postgres.log
173

  
170 174
postgres-Darwin: _always
171 175
	@echo $(emph)'Installing PostgreSQL on Mac OS X:'$(endEmph)
172 176
	@echo 'Download it using the topmost "Mac OS X" link at http://http://www.enterprisedb.com/products-services-training/pgdownload'
......
174 178
	@echo 'Run the installer in it'
175 179
	@$(wait)
176 180
	$(foreach lib,$(macPostgresLibs),$(call macUsePostgresLib,$(lib)))
181
	$(asAdmin) cp schemas/postgresql.Mac.conf $(macPostgresDir)/data/postgresql.conf
182
	$(pg_ctl-Darwin) restart
177 183

  
178 184
postgres-: _always ; # other OSes
179 185

  
180 186
psqlOpts := --set ON_ERROR_STOP=1 --quiet
181
asAdmin := sudo -E -u postgres
182 187
psqlAsAdmin := $(asAdmin) psql $(psqlOpts)
183 188
    # -E preserves env vars so PGOPTIONS is passed to psql
184 189
psqlAsAdminVegbien := $(psqlAsAdmin) vegbien

Also available in: Unified diff