Revision 14755
Added by Aaron Marcuse-Kubitza about 10 years ago
| trunk/Makefile | ||
|---|---|---|
| 138 | 138 |
endef |
| 139 | 139 |
# ignore errors if patch has already been applied |
| 140 | 140 |
|
| 141 |
apacheConf := /etc/apache2/apache2.conf |
|
| 142 |
apacheConfPhppgadminLine := Include /etc/phppgadmin/apache.conf |
|
| 143 |
editApacheConfForPhppgadmin =\ |
|
| 144 |
$(if $(shell grep -F "$(apacheConfPhppgadminLine)" $(apacheConf)),,\ |
|
| 145 |
$(call sudoAppend,$(apacheConf),\n$(apacheConfPhppgadminLine))) |
|
| 146 |
|
|
| 147 | 141 |
asBien := sudo -E -u bien |
| 148 | 142 |
pgVersion = "$$(env minor=1 bin/pg_version)" |
| 149 | 143 |
|
| ... | ... | |
| 210 | 204 |
$(editPhppgadmin) |
| 211 | 205 |
-sudo ln -s ../conf.d/phppgadmin /etc/apache2/conf-available/phppgadmin.conf |
| 212 | 206 |
sudo a2enconf phppgadmin |
| 213 |
$(editApacheConfForPhppgadmin) |
|
| 214 | 207 |
-sudo apache2ctl restart |
| 215 | 208 |
|
| 216 | 209 |
postgres-Linux: _always |
Also available in: Unified diff
/Makefile: phppgadmin-Linux: removed no longer needed $(editApacheConfForPhppgadmin), as phpPgAdmin no longer uses this file (/etc/phppgadmin/apache.conf)