summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian1998-10-12 04:32:24 +0000
committerBruce Momjian1998-10-12 04:32:24 +0000
commitd2d919f7b79a5f1e9025610bde4382f4119650b3 (patch)
tree6f17e49e93814c6b45fe924223b5543481edbeb8
parent51fd8dd36ad666f5a71a0e16e83ac82f18de8127 (diff)
tcl cleanup.
-rw-r--r--src/bin/pgtclsh/Makefile8
-rw-r--r--src/pl/plpgsql/src/mklang.sql4
2 files changed, 6 insertions, 6 deletions
diff --git a/src/bin/pgtclsh/Makefile b/src/bin/pgtclsh/Makefile
index 0bf1952dbb9..efa3b3376ae 100644
--- a/src/bin/pgtclsh/Makefile
+++ b/src/bin/pgtclsh/Makefile
@@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.19 1998/10/12 02:40:58 momjian Exp $
+# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.20 1998/10/12 04:32:22 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -19,7 +19,7 @@ include ../../Makefile.global
#
include Makefile.tcltkdefs
-CFLAGS+= -I$(SRCDIR)/interfaces/libpgtcl
+CFLAGS+= $(X_CFLAGS) -I$(SRCDIR)/interfaces/libpgtcl
ifdef KRBVERS
LDFLAGS+= $(KRBLIBS)
@@ -41,8 +41,8 @@ pgtclsh: pgtclAppInit.o
pgtksh: pgtkAppInit.o
$(CC) $(CFLAGS) $(TK_DEFS) -o $@ pgtkAppInit.o \
- $(LIBPGTCL) $(LIBPQ) $(TK_LIB_SPEC) $(TK_LIBS) \
- $(TCL_LIB_SPEC) $(TCL_LIB) $(LDFLAGS)
+ $(LIBPGTCL) $(LIBPQ) $(X_LIBS) $(TK_LIB_SPEC) $(TK_LIBS) \
+ $(TCL_LIB_SPEC) $(TCL_LIB) $(X11_LIBS) $(LDFLAGS)
install: pgtclsh pgtksh
$(INSTALL) $(INSTL_EXE_OPTS) pgtclsh $(BINDIR)/pgtclsh
diff --git a/src/pl/plpgsql/src/mklang.sql b/src/pl/plpgsql/src/mklang.sql
index d68f5c336e9..4a27e1ef4c5 100644
--- a/src/pl/plpgsql/src/mklang.sql
+++ b/src/pl/plpgsql/src/mklang.sql
@@ -1,11 +1,11 @@
--
-- PL/pgSQL language declaration
--
--- $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/mklang.sql,v 1.1 1998/08/24 19:14:48 momjian Exp $
+-- $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/mklang.sql,v 1.2 1998/10/12 04:32:24 momjian Exp $
--
create function plpgsql_call_handler() returns opaque
- as '/usr/local/pgsql/lib/plpgsql.so'
+ as '${exec_prefix}/lib/plpgsql.so'
language 'C';
create trusted procedural language 'plpgsql'