Doco changes to reflect use of 'createlang' as default language creator.

git-svn-id: http://svn.osgeo.org/postgis/trunk@113 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/README.postgis b/README.postgis
index f90e1f83da121873e24caed347157983cc27b8fc..8103eb41504543052a5d65f71a3114d5013d9538 100644 (file)
--- a/README.postgis
+++ b/README.postgis
@@ -37,17 +37,11 @@ Then run:
   make install
 
 PostGIS now requires the PL/pgSQL procedural language in order to operate
-correctly. To install PL/pgSQL, locate the plpgsql.so library in your
-PostgreSQL installation (usually in the 'lib' directory). Then run the
-following SQL commands in your database, replacing the plpgsql.so 
-location with the correct one for your system:
-
-  CREATE FUNCTION plpgsql_call_handler() 
-     RETURNS OPAQUE AS '/usr/local/pgsql/lib/plpgsql.so' 
-     LANGUAGE 'C';
-  CREATE TRUSTED PROCEDURAL LANGUAGE 'plpgsql'
-     HANDLER plpgsql_call_handler
-     LANCOMPILER 'PL/pgSQL';
+correctly. To install PL/pgSQL you should use the createlang script coming
+with postgresql.  (The PostgreSQL 7.1 Programmer's Guide details 
+if you want to this manually for some reason.)
+
+  createlang plpgsql yourdatabase
 
 Finally, load the function and object definitions into your database 
 with psql (you must run this as a database user with system privledges):

diff --git a/doc/postgis.xml b/doc/postgis.xml
index bdc4825816f8c10dc96d39ed45ab042ec24cea3b..db08be39abaad87d21f5f759e42eb0e5311e040b 100644 (file)
--- a/doc/postgis.xml
+++ b/doc/postgis.xml
@@ -109,11 +109,17 @@
                                "postgis" directory, and run the compile and install commands. </para> 
                         <programlisting># cd ./postgis-0.6 
 # make 
-# make install</programlisting></listitem><listitem><para>As of version 0.6, PostGIS requires the PL/pgSQL procedural language extension. Before loading the postgis.sql file, you must first enable PL/pgSQL. The code snippet below gives an example, substitute the correct location of your <filename>plpgsql.so</filename> library.</para><programlisting>CREATE FUNCTION plpgsql_call_handler () RETURNS OPAQUE AS
-   '/usr/local/pgsql/lib/plpgsql.so' LANGUAGE 'C';
-CREATE TRUSTED PROCEDURAL LANGUAGE 'plpgsql'
-   HANDLER plpgsql_call_handler
-   LANCOMPILER 'PL/pgSQL';</programlisting></listitem> 
+# make install</programlisting></listitem>
+               <listitem><para>
+As of version 0.6, PostGIS requires the PL/pgSQL procedural language extension.
+Before loading the postgis.sql file, you must first enable PL/pgSQL. 
+You should use the <filename>createlang</filename> command.
+The PostgreSQL 7.1 Programmer's Guide has the details if you want to this
+manually for some reason.
+<programlisting>
+# createlang plpgsql [yourdatabase]
+</programlisting>
+               </listitem> 
                  <listitem> 
                         <para>Finally, you
                                must load the PostGIS object and function definitions into your database. </para> 

diff --git a/postgis.sql.in b/postgis.sql.in
index 8efcc5edd96f2975017c4581f1bed4d670cb871c..1bb84751dc8df94d5e17e9ef5b11536f3e805890 100644 (file)
--- a/postgis.sql.in
+++ b/postgis.sql.in
@@ -1,14 +1,8 @@
 BEGIN TRANSACTION;
 
 
---- you might have to define the plpgsql language something like;
-
--- CREATE FUNCTION plpgsql_call_handler () RETURNS OPAQUE AS
---     '/usr/local/pgsql/lib/plpgsql.so' LANGUAGE 'C';
---
--- CREATE TRUSTED PROCEDURAL LANGUAGE 'plpgsql'
---     HANDLER plpgsql_call_handler
---     LANCOMPILER 'PL/pgSQL';
+--- you might have to define the plpgsql language usually done with the;
+---   changelang   script.
 
 -- here's some hockey code to test to see if plpgsql is installed
 --  if it is, you get a message "plpgsql is installed"