aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2012-10-10 12:45:36 -0700
committerVijay Dev <vijaydev.cse@gmail.com>2012-10-10 12:45:36 -0700
commit2441160c05f16c28ab466105de8d0c4474b76ddd (patch)
tree8a10a0d6aed7032b2f1ef932ccceaaeee4ae455b
parentddb9469b7410f277edf1223601871c452f5baf58 (diff)
parent58d69a536cfa067f9b1e963e20162ff4c26dc32c (diff)
downloadrails-2441160c05f16c28ab466105de8d0c4474b76ddd.tar.gz
rails-2441160c05f16c28ab466105de8d0c4474b76ddd.tar.bz2
rails-2441160c05f16c28ab466105de8d0c4474b76ddd.zip
Merge pull request #7898 from olivierlacan/pg_homebrew_instructions
Offer instructions for pg gem when installed via Homebrew
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml4
1 files changed, 3 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml
index 07223a71c9..22c9194fad 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml
@@ -2,7 +2,9 @@
#
# Install the pg driver:
# gem install pg
-# On Mac OS X with macports:
+# On OS X with Homebrew:
+# gem install pg -- --with-pg-config=/usr/local/bin/pg_config
+# On OS X with MacPorts:
# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config
# On Windows:
# gem install pg