Revision 11662
Added by Aaron Marcuse-Kubitza about 11 years ago
| Makefile | ||
|---|---|---|
| 142 | 142 |
asBien := sudo -E -u bien |
| 143 | 143 |
pgVersion = "$$(env minor=1 bin/pg_version)" |
| 144 | 144 |
|
| 145 |
linuxPostgresDir := /etc/postgresql/9.1/main
|
|
| 145 |
linuxPostgresDir := /etc/postgresql/9.3/main
|
|
| 146 | 146 |
define pg_ctl-Linux |
| 147 | 147 |
$(asAdmin) /etc/init.d/postgresql $(1) |
| 148 | 148 |
endef |
| 149 | 149 |
|
| 150 |
macPostgresDir := /Library/PostgreSQL/9.1
|
|
| 150 |
macPostgresDir := /Library/PostgreSQL/9.3
|
|
| 151 | 151 |
define macUsePostgresLib |
| 152 | 152 |
sudo mv $(libDest) $(libDest).old||sudo rm -f $(libDest) |
| 153 | 153 |
sudo ln -s $(macPostgresDir)/lib/$(1) $(libDest) |
| ... | ... | |
| 160 | 160 |
macPostgresLibs := $(macPostgresLibs:%=%.dylib) |
| 161 | 161 |
|
| 162 | 162 |
define pg_ctl-Darwin |
| 163 |
$(asAdmin) pg_ctl -D $(macPostgresDir)/data -l $(macPostgresDir)/postgres.log $(1) |
|
| 163 |
$(asAdmin) pg_ctl -D $(macPostgresDir)/data -l $(macPostgresDir)/data/postgres.log $(1)
|
|
| 164 | 164 |
sleep 2 |
| 165 | 165 |
endef |
| 166 | 166 |
|
Also available in: Unified diff
Makefile, schemas/.Mac.conf: upgraded to PostgreSQL 9.3, which is needed for proper exception parsing in the auto-re-create-views functionality. this also removes the Mac 10.8 Mountain Lion quirks, such as renaming the postgres user to _postgres (which messed everything up, but is now back to normal).