From b8cbb8c7e3884a3bcf09e5de9e2d9e4d251980c4 Mon Sep 17 00:00:00 2001 From: Tom Lane <tgl@sss.pgh.pa.us> Date: Fri, 9 Feb 2001 01:05:42 +0000 Subject: [PATCH] Remove no-longer-needed mklang script; now superseded by createlang. --- src/pl/plpgsql/src/INSTALL | 11 ++--------- src/pl/plpgsql/src/Makefile | 8 ++------ src/pl/plpgsql/src/mklang.sql.in | 13 ------------- 3 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 src/pl/plpgsql/src/mklang.sql.in diff --git a/src/pl/plpgsql/src/INSTALL b/src/pl/plpgsql/src/INSTALL index d46576e6853..7a636b1daf4 100644 --- a/src/pl/plpgsql/src/INSTALL +++ b/src/pl/plpgsql/src/INSTALL @@ -1,22 +1,15 @@ Installation of PL/pgSQL - 1) Type 'make' to build the shared plpgsql object. 2) Type 'make install' to install the shared object in the PostgreSQL library directory. 3) Declare the PL/pgSQL procedural language in your - database by - - psql dbname <mklang.sql + database by running the createlang script: - If the PostgreSQL library directory is different from - /usr/local/pgsql/lib you must edit mklang.sql prior. + createlang plpgsql DBNAME If you declare the language in the template1 database, any subsequently created database will have PL/pgSQL support installed automatically. - - - diff --git a/src/pl/plpgsql/src/Makefile b/src/pl/plpgsql/src/Makefile index fb3a56ecd33..4cb5a4c9c02 100644 --- a/src/pl/plpgsql/src/Makefile +++ b/src/pl/plpgsql/src/Makefile @@ -2,7 +2,7 @@ # # Makefile for the plpgsql shared object # -# $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Makefile,v 1.9 2000/10/23 21:44:03 petere Exp $ +# $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Makefile,v 1.10 2001/02/09 01:05:42 tgl Exp $ # #------------------------------------------------------------------------- @@ -71,12 +71,8 @@ endif distprep: $(srcdir)/pl_scan.c $(srcdir)/pl.tab.h $(srcdir)/pl_gram.c -mklang.sql: mklang.sql.in - sed -e 's%__libdir__%$(libdir)%g' -e 's%__DLSUFFIX__%$(DLSUFFIX)%g' < $< > $@ - - clean distclean: clean-lib - rm -f $(OBJS) mklang.sql + rm -f $(OBJS) @rm -f y.tab.c y.tab.h lex.yy.c maintainer-clean: clean diff --git a/src/pl/plpgsql/src/mklang.sql.in b/src/pl/plpgsql/src/mklang.sql.in deleted file mode 100644 index dde06fc1031..00000000000 --- a/src/pl/plpgsql/src/mklang.sql.in +++ /dev/null @@ -1,13 +0,0 @@ --- --- PL/pgSQL language declaration --- --- $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/mklang.sql.in,v 1.5 2000/06/20 16:40:10 petere Exp $ --- - -create function plpgsql_call_handler() returns opaque - as '__libdir__/plpgsql__DLSUFFIX__' - language 'C'; - -create trusted procedural language 'plpgsql' - handler plpgsql_call_handler - lancompiler 'PL/pgSQL'; -- GitLab