diff --git a/database/postgresql/config.in b/database/postgresql/config.in index 8977db3d3..b3927da45 100644 --- a/database/postgresql/config.in +++ b/database/postgresql/config.in @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../postgresql/config.in -# Copyright (C) 2006 - 2010 The OpenSDE Project +# Copyright (C) 2006 - 2011 The OpenSDE Project # # More information can be found in the files COPYING and README. # @@ -16,9 +16,6 @@ if pkgcheck postgresql X then menu_begin MENU_PKG_POSTGRESQL 'PostgreSQL Package Options' - text 'Install prefix for postgresql packages' \ - SDECFG_PKG_POSTGRESQL_PREFIX "opt/postgresql" - bool "Include PostgreSQL contributed 3rd. Party Applications" \ SDECFG_PKG_POSTGRESQL_CONTRIB 1 diff --git a/database/postgresql/postgresql.conf b/database/postgresql/postgresql.conf index 9edc0ed05..709dfd8c8 100644 --- a/database/postgresql/postgresql.conf +++ b/database/postgresql/postgresql.conf @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../postgresql/postgresql.conf -# Copyright (C) 2006 - 2010 The OpenSDE Project +# Copyright (C) 2006 - 2011 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # @@ -15,11 +15,7 @@ # --- SDE-COPYRIGHT-NOTE-END --- if [ $prefix_auto = 1 ] ; then - if [ "$SDECFG_PKG_POSTGRESQL_PREFIX" ] ; then - prefix="$SDECFG_PKG_POSTGRESQL_PREFIX" - else - prefix="opt/postgresql" - fi + prefix="opt/postgresql" set_confopt fi